Merge branch 'feature/character_screens' into 'master'

Graphics for khanat-code Issue 14

Complément de https://git.khaganat.net/khaganat/khanat-code/merge_requests/24

See merge request !1
This commit is contained in:
deed 2016-10-10 19:41:46 +00:00
commit 0512a2a53d
21 changed files with 187 additions and 292 deletions

View file

@ -80,7 +80,6 @@
</proc> </proc>
<proc id="charsel_disable_buttons"> <proc id="charsel_disable_buttons">
<action handler="set" params="target_property=ui:outgame:charsel:but_slot0:active|value=0"/> <action handler="set" params="target_property=ui:outgame:charsel:but_slot0:active|value=0"/>
<action handler="set" params="target_property=ui:outgame:charsel:but_slot1:active|value=0"/> <action handler="set" params="target_property=ui:outgame:charsel:but_slot1:active|value=0"/>
@ -99,7 +98,6 @@
<action handler="set" params="target_property=ui:outgame:charsel:quit_but:active|value=0"/> <action handler="set" params="target_property=ui:outgame:charsel:quit_but:active|value=0"/>
</proc> </proc>
<proc id="charsel_enable_buttons"> <proc id="charsel_enable_buttons">
<action handler="set" params="target_property=ui:outgame:charsel:but_slot0:active|value=1"/> <action handler="set" params="target_property=ui:outgame:charsel:but_slot0:active|value=1"/>
<action handler="set" params="target_property=ui:outgame:charsel:but_slot1:active|value=1"/> <action handler="set" params="target_property=ui:outgame:charsel:but_slot1:active|value=1"/>
@ -118,18 +116,19 @@
<action handler="set" params="target_property=ui:outgame:charsel:quit_but:active|value=1"/> <action handler="set" params="target_property=ui:outgame:charsel:quit_but:active|value=1"/>
</proc> </proc>
<proc id="restart_sel_select_fx"> <proc id="restart_sel_select_fx">
<action handler="anim_start" params="anim=anim_sel_select_fx" /> <action handler="anim_start" params="anim=anim_sel_select_fx" />
</proc> </proc>
<!-- Init Slots --> <!-- Init Slots -->
<!-- Proc to check if slot is empty or full-->
<proc id="proc_charsel_initslot"> <proc id="proc_charsel_initslot">
<action handler="proc" cond="not(isCharSelSlotEmpty(@0))" params="proc_charsel_initslot_full|@0" /> <action handler="proc" cond="not(isCharSelSlotEmpty(@0))" params="proc_charsel_initslot_full|@0" />
<action handler="proc" cond="isCharSelSlotEmpty(@0)" params="proc_charsel_initslot_empty|@0" /> <action handler="proc" cond="isCharSelSlotEmpty(@0)" params="proc_charsel_initslot_empty|@0" />
</proc> </proc>
<!-- Proc for used/full character slot-->
<proc id="proc_charsel_initslot_full"> <proc id="proc_charsel_initslot_full">
<action handler="set_db_from_slot" params="dblink=UI:TEMP:CHARSLOT@0|slot=@0" /> <action handler="set_db_from_slot" params="dblink=UI:TEMP:CHARSLOT@0|slot=@0" />
@ -147,13 +146,14 @@
<action handler="get_slot" cond="not(isCharSelSlotEmpty(@0))" params="prop=name|target=ui:outgame:charsel:but_slot@0:uc_hardtext|slot=@0" /> <action handler="get_slot" cond="not(isCharSelSlotEmpty(@0))" params="prop=name|target=ui:outgame:charsel:but_slot@0:uc_hardtext|slot=@0" />
</proc> </proc>
<!-- Proc for empty character slot-->
<proc id="proc_charsel_initslot_empty"> <proc id="proc_charsel_initslot_empty">
<action handler="set" params="target_property=ui:outgame:charsel:slot@0:active|value=0" /> <action handler="set" params="target_property=ui:outgame:charsel:slot@0:active|value=0" />
<action handler="set" params="target_property=ui:outgame:charsel:empty_slot@0:active|value=1" /> <action handler="set" params="target_property=ui:outgame:charsel:empty_slot@0:active|value=1" />
<action handler="set" params="target_property=ui:outgame:charsel:but_slot@0:hardtext|value='uiCharSel_EmptySlot'" /> <action handler="set" params="target_property=ui:outgame:charsel:but_slot@0:hardtext|value='uiCharSel_EmptySlot'" />
</proc> </proc>
<!-- Proc to get proper specific anim per race-->
<proc id="select_specie_anim"> <proc id="select_specie_anim">
<action handler="set" params="target_property=ui:outgame:charsel:char3d:char:anim|value=5" /> <action handler="set" params="target_property=ui:outgame:charsel:char3d:char:anim|value=5" />
<!-- <!--
@ -164,7 +164,6 @@
--> -->
</proc> </proc>
<!-- When we click on a slot --> <!-- When we click on a slot -->
<proc id="proc_charsel_clickslot"> <proc id="proc_charsel_clickslot">
<action handler="set" params="dblink=UI:TEMP:CHARSELSLOT|value=-1" /> <action handler="set" params="dblink=UI:TEMP:CHARSELSLOT|value=-1" />
@ -177,17 +176,17 @@
<action handler="set" params="target_property=ui:outgame:charsel:char3d:active|value=not(isCharSelSlotEmpty(@0))" /> <action handler="set" params="target_property=ui:outgame:charsel:char3d:active|value=not(isCharSelSlotEmpty(@0))" />
<action handler="set" params="target_property=ui:outgame:charsel:empty3d:active|value=isCharSelSlotEmpty(@0)" /> <action handler="set" params="target_property=ui:outgame:charsel:empty3d:active|value=isCharSelSlotEmpty(@0)" />
<action handler="set" params="target_property=ui:outgame:charsel:select_menu:x | <action handler="set" params="target_property=ui:outgame:charsel:select_menu:x |
value=switch(@0, 150, 150, 150, 150, 150)" /> value=switch(@0, 2, 207, 412, 617, 822)" />
<action handler="set" params="target_property=ui:outgame:charsel:but_slot@0:pushed|value=1" /> <action handler="set" params="target_property=ui:outgame:charsel:but_slot@0:pushed|value=1" />
<!-- Position des effets 3D ICI -->
<action handler="set" params="target_property=ui:outgame:charsel:char3d:env:name | <action handler="set" params="target_property=ui:outgame:charsel:char3d:env:name |
value=switch(@UI:TEMP:CHAR3D:PEOPLE, 'outgame_zorai.ig', 'outgame_zorai.ig', 'outgame_zorai.ig', 'outgame_zorai.ig')" /> value=switch(@UI:TEMP:CHAR3D:PEOPLE, 'outgame_zorai.ig', 'outgame_zorai.ig', 'outgame_zorai.ig', 'outgame_zorai.ig')" />
<action handler="set" params="target_property=ui:outgame:charsel:char3d:cam:fov | <action handler="set" params="target_property=ui:outgame:charsel:char3d:cam:fov |
value=switch(@UI:TEMP:CHAR3D:PEOPLE, 72, 72, 72, 72)" /> value=switch(@UI:TEMP:CHAR3D:PEOPLE, 72, 72, 72, 72)" />
<action handler="set" params="target_property=ui:outgame:charsel:3d_select:x | <action handler="set" params="target_property=ui:outgame:charsel:3d_select:x |
value=switch(@0, 150, 150, 150, 150, 150)" /> value=switch(@0, 2, 207, 412, 617, 822)" />
<action handler="set" params="target_property=ui:outgame:charsel:3d_select:y | <action handler="set" params="target_property=ui:outgame:charsel:3d_select:y |
value=switch(@0, -100, -120, -140, -160, -180)" /> value=switch(@0, -95, -65, -35, -65, -95)" />
<action handler="proc" params="proc_charsel_infos2" /> <action handler="proc" params="proc_charsel_infos2" />
</proc> </proc>
@ -202,7 +201,6 @@
<action handler="lua:game:openEditorMenu()" /> <action handler="lua:game:openEditorMenu()" />
</proc> </proc>
<proc id="proc_charsel_edit_scenario"> <proc id="proc_charsel_edit_scenario">
<action handler="set" params="dblink=UI:TEMP:EDIT_SCENARIO|value=1" /> <action handler="set" params="dblink=UI:TEMP:EDIT_SCENARIO|value=1" />
<action handler="anim_start" params="anim=anim_charsel_outro_play" /> <action handler="anim_start" params="anim=anim_charsel_outro_play" />
@ -224,9 +222,6 @@
<action handler="anim_start" params="anim=anim_charsel_delout" /> <action handler="anim_start" params="anim=anim_charsel_delout" />
</proc> </proc>
<proc id="proc_charsel_play2"> <proc id="proc_charsel_play2">
<action handler="proc" params="charsel_disable_buttons" /> <action handler="proc" params="charsel_disable_buttons" />
<action handler="launch_game" params="slot=@UI:TEMP:CHARSELSLOT|edit_mode=@UI:TEMP:EDIT_SCENARIO" /> <action handler="launch_game" params="slot=@UI:TEMP:CHARSELSLOT|edit_mode=@UI:TEMP:EDIT_SCENARIO" />
@ -235,6 +230,7 @@
<proc id="proc_charsel_create_new"> <proc id="proc_charsel_create_new">
<action handler="anim_start" params="anim=anim_charsel_outro_new" /> <action handler="anim_start" params="anim=anim_charsel_outro_new" />
</proc> </proc>
<proc id="proc_charsel_create_new2"> <proc id="proc_charsel_create_new2">
<action handler="proc" params="charsel_disable_buttons" /> <action handler="proc" params="charsel_disable_buttons" />
<action handler="set" params="dblink=UI:CURRENT_SCREEN|value=%screen_appear" /> <action handler="set" params="dblink=UI:CURRENT_SCREEN|value=%screen_appear" />
@ -243,33 +239,30 @@
<proc id="proc_charsel_create_ran"> <proc id="proc_charsel_create_ran">
<action handler="anim_start" params="anim=anim_charsel_outro_ran" /> <action handler="anim_start" params="anim=anim_charsel_outro_ran" />
</proc> </proc>
<proc id="proc_charsel_create_ran2"> <proc id="proc_charsel_create_ran2">
<action handler="proc" params="charsel_disable_buttons" /> <action handler="proc" params="charsel_disable_buttons" />
<action handler="set" params="dblink=UI:CURRENT_SCREEN|value=%screen_appear" /> <action handler="set" params="dblink=UI:CURRENT_SCREEN|value=%screen_appear" />
</proc> </proc>
<!-- When we click on the exit button --> <!-- When we click on the exit button -->
<proc id="proc_quit" > <proc id="proc_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>
<!-- Relance la rotation du sigle empty --> <!-- Relance la rotation du sigle empty -->
<proc id="restart_empty_anim"> <proc id="restart_empty_anim">
<action handler="anim_start" params="anim=anim_empty" /> <action handler="anim_start" params="anim=anim_empty" />
</proc> </proc>
<!-- ***************** --> <!-- ***************** -->
<!-- * TEMPLATES * --> <!-- * TEMPLATES * -->
<!-- ***************** --> <!-- ***************** -->
<template name="char_slot_view" posparent="parent" posref="TL TL" id="" dblink="" x="0" y="0" > <template name="char_slot_view" posparent="parent" posref="TL TL" id="" dblink="" x="0" y="0" >
<scene3d id="#id" posparent="#posparent" w="140" h="16" x="#x" y="#y" posref="#posref" curcam="cam" curcs="env" render_layer="-2" user_interaction="false" <scene3d id="#id" posparent="#posparent" w="200" h="150" x="#x" y="#y" posref="#posref" curcam="cam" curcs="env" render_layer="-2" user_interaction="false"
ambient="128 96 64" sun_ambient="0 0 0" sun_diffuse="255 255 196" sun_specular="0 0 0" sun_direction="-1.0 1.0 -1.0" > ambient="128 96 64" sun_ambient="0 0 0" sun_diffuse="255 255 196" sun_specular="0 0 0" sun_direction="-1.0 1.0 -1.0" >
<character3d id="char" dblink="#dblink" pos="0.0 26.5 0.85" rot="0.0 0.0 10.0" /> <character3d id="char" dblink="#dblink" pos="0.0 26.5 0.85" rot="0.0 0.0 10.0" />
@ -291,10 +284,9 @@
</template> </template>
<template name="empty_slot_view" posparent="parent" posref="TL TL" id="" dblink="" x="0" y="-3" > <template name="empty_slot_view" posparent="parent" posref="TL TL" id="" dblink="" x="0" y="-3" >
<scene3d id="#id" posparent="#posparent" w="137" h="139" x="#x" y="#y" posref="#posref" curcam="cam" curcs="env" render_layer="-2" user_interaction="false" <scene3d id="#id" posparent="#posparent" w="200" h="150" x="#x" y="#y" posref="#posref" curcam="cam" curcs="env" render_layer="-2" user_interaction="false"
ambient="128 96 64" sun_ambient="0 0 0" sun_diffuse="255 255 196" sun_specular="0 0 0" sun_direction="-1.0 1.0 -1.0" > ambient="128 96 64" sun_ambient="0 0 0" sun_diffuse="255 255 196" sun_specular="0 0 0" sun_direction="-1.0 1.0 -1.0" >
@ -309,34 +301,22 @@
</template> </template>
<!-- ******************** --> <!-- ******************** -->
<!-- * DELETE CHARACTER * --> <!-- * DELETE CHARACTER * -->
<!-- ******************** --> <!-- ******************** -->
<group type="modal" id="charsel_delchar_confirm" posref="MM MM" w="300" h="180" <group type="modal" id="charsel_delchar_confirm" posref="MM MM" w="300" h="180" mouse_pos="false" escapable="false" exit_click_out="false" display="false">
mouse_pos="false" escapable="false" exit_click_out="false" display="false">
<instance template="outgame_popup" id="back" posref="TL TL" /> <instance template="outgame_popup" id="back" posref="TL TL" />
<view type="text" id="text" posref="TM TM" x="0" y="-60" color="255 255 255 255" global_color="false" line_maxw="284" fontsize="17" shadow="true" hardtext="uiCharSel_DelChar" multi_line="true" multi_line_space="0"/>
<view type="text" id="text" posref="TM TM" x="0" y="-60" color="255 255 255 255" global_color="false" line_maxw="284" <ctrl style="valid_txt_button" id="submit" posref="BR BR" x="-8" y="8" hardtext="uiCP_Delete_yes" onover="play_sound" params_over="name=specie_but_over" onclick_l="proc" params_l="proc_charsel_delchar_confirm_ok" />
fontsize="17" shadow="true" hardtext="uiCharSel_DelChar" multi_line="true" multi_line_space="0"/>
<ctrl style="valid_txt_button" id="submit" posref="BR BR" x="-8" y="8" hardtext="uiCP_Delete_yes" <ctrl style="valid_txt_button" id="cancel" posref="TR BR" posparent="submit" x="0" y="4" hardtext="uiCP_Delete_no" onover="play_sound" params_over="name=specie_but_over" onclick_l="proc" params_l="proc_charsel_delchar_confirm_cancel" />
onover="play_sound" params_over="name=specie_but_over"
onclick_l="proc" params_l="proc_charsel_delchar_confirm_ok" />
<ctrl style="valid_txt_button" id="cancel" posref="TR BR" posparent="submit" x="0" y="4" hardtext="uiCP_Delete_no"
onover="play_sound" params_over="name=specie_but_over"
onclick_l="proc" params_l="proc_charsel_delchar_confirm_cancel" />
</group> </group>
<!-- ********* --> <!-- ********* -->
<!-- * INFOS * --> <!-- * INFOS * -->
<!-- ********* --> <!-- ********* -->
@ -364,13 +344,9 @@
<group type="modal" id="charsel_infos1" x="-74" y="-68" w="698" h="652" posref="TR TR" render_layer="1" <group type="modal" id="charsel_infos1" x="-74" y="-68" w="698" h="652" posref="TR TR" render_layer="1"
mouse_pos="false" escapable="false" exit_click_out="true" display="false"> mouse_pos="false" escapable="false" exit_click_out="true" display="false">
<view type="text" id="text" posref="TM TM" x="0" y="0" color="255 255 255 255" global_color="false" line_maxw="780" <view type="text" id="text" posref="TM TM" x="0" y="0" color="255 255 255 255" global_color="false" line_maxw="780" fontsize="17" shadow="true" hardtext="uiCharSel_Infos1" multi_line="true" multi_line_space="0"/>
fontsize="17" shadow="true" hardtext="uiCharSel_Infos1" multi_line="true" multi_line_space="0"/>
<ctrl style="valid_txt_button" id="quit_but" posref="BM BM" y="0" hardtext="uiInfos_Close" onover="play_sound" params_over="name=specie_but_over" onclick_l="proc" params_l="proc_charsel_infos"/>
<ctrl style="valid_txt_button" id="quit_but" posref="BM BM" y="0" hardtext="uiInfos_Close"
onover="play_sound" params_over="name=specie_but_over"
onclick_l="proc" params_l="proc_charsel_infos"/>
</group> </group>
@ -420,7 +396,6 @@
<action handler="anim_start" params="anim=anim_charsel_delout" /> <action handler="anim_start" params="anim=anim_charsel_delout" />
</proc> </proc>
<proc id="charsel_init_buttons"> <proc id="charsel_init_buttons">
<action handler="add_link" params="id=play_edit_session_del_init|expr=and(not(isCharSelSlotInRingSession(@UI:TEMP:CHARSELSLOT)), not(isCharSelSlotEmpty(@UI:TEMP:CHARSELSLOT))))|target=ui:outgame:charsel:play_but:active,ui:outgame:charsel:edit_session_but:active,ui:outgame:charsel:del_but:active" /> <action handler="add_link" params="id=play_edit_session_del_init|expr=and(not(isCharSelSlotInRingSession(@UI:TEMP:CHARSELSLOT)), not(isCharSelSlotEmpty(@UI:TEMP:CHARSELSLOT))))|target=ui:outgame:charsel:play_but:active,ui:outgame:charsel:edit_session_but:active,ui:outgame:charsel:del_but:active" />
<action handler="add_link" params="id=create_new_but_init|expr=isCharSelSlotEmpty(@UI:TEMP:CHARSELSLOT)|target=ui:outgame:charsel:create_new_but:active" /> <action handler="add_link" params="id=create_new_but_init|expr=isCharSelSlotEmpty(@UI:TEMP:CHARSELSLOT)|target=ui:outgame:charsel:create_new_but:active" />
@ -431,26 +406,22 @@
<action handler="remove_link" params="id=resume_session_but_init" /> <action handler="remove_link" params="id=resume_session_but_init" />
</proc> </proc>
<!-- ***************** --> <!-- ***************** -->
<!-- * MAIN WINDOW * --> <!-- * MAIN WINDOW * -->
<!-- ***************** --> <!-- ***************** -->
<group id="charsel" w="1024" h="768" posref="MM MM" <group id="charsel" w="1024" h="768" posref="MM MM" on_active="proc" on_active_params="proc_charsel_active" >
on_active="proc" on_active_params="proc_charsel_active" >
<!-- TEMP BACK --> <!-- TEMP BACK -->
<view type="bitmap" id="bg" posref="TL TL" x="0" y="0" render_layer="-3" scale="true" w="1024" h="768" texture="blank.tga" <view type="bitmap" id="bg" posref="TL TL" x="0" y="0" render_layer="-3" scale="true" w="1024" h="768" texture="blank.tga"
color="0 0 0 255" global_color="false" /> color="0 0 0 255" global_color="false" />
<!--***************--> <!--***************-->
<!-- MAIN 3D SCENE --> <!-- MAIN 3D SCENE -->
<!--***************--> <!--***************-->
<!-- Vue Globale -->
<!-- Vue Globale --><!-- <scene3d id="char3d" x="2" y="2" w="1024" h="768" posref="BL BL" curcam="cam" curcs="env" render_layer="-2"
<scene3d id="char3d" x="2" y="2" w="1020" h="560" posref="BL BL" curcam="cam" curcs="env" render_layer="-2"
user_interaction="true" rotz_factor="0.017" user_interaction="true" rotz_factor="0.017"
roty_factor="0.005" roty_limit_min="-20" roty_limit_max="15" roty_factor="0.005" roty_limit_min="-20" roty_limit_max="15"
dist_factor="0.005" dist_limit_min="3.0" dist_limit_max="3.8" dist_factor="0.005" dist_limit_min="3.0" dist_limit_max="3.8"
@ -474,7 +445,7 @@
<auto_anim name="brazero-inter2.anim"/> <auto_anim name="brazero-inter2.anim"/>
<auto_anim name="lanterne-int1.anim"/> <auto_anim name="lanterne-int1.anim"/>
<auto_anim name="lanterne-int2.anim"/> <auto_anim name="lanterne-int2.anim"/>
</scene3d> --> </scene3d>
<!-- CHARACTER STILL IN RING SESSION !! <!-- CHARACTER STILL IN RING SESSION !!
<view type="text" id="in_ring_session" multi_line="true" w="650" line_maxw="650" posref="TL TL" global_color="false" render_layer="2" fontsize="17" shadow="true" y="-80" x="260" hardtext_format="uiCP_InRingSession"/> <view type="text" id="in_ring_session" multi_line="true" w="650" line_maxw="650" posref="TL TL" global_color="false" render_layer="2" fontsize="17" shadow="true" y="-80" x="260" hardtext_format="uiCP_InRingSession"/>
@ -495,14 +466,13 @@
<shape id="empty" name="empty.shape" pos="0.0 26.5 2.5" rot="0.0 0.0 0.0" /> <shape id="empty" name="empty.shape" pos="0.0 26.5 2.5" rot="0.0 0.0 0.0" />
</scene3d> </scene3d>
<!--***********--> <!--***********-->
<!-- MAIN MENU --> <!-- MAIN MENU -->
<!--***********--> <!--***********-->
<!-- View of each slot --> <!-- View of each slot -->
<!-- <instance template="char_slot_view" id="slot0" dblink="UI:TEMP:CHARSLOT0" posref="TL TL" x="2" y="-95"/> <instance template="char_slot_view" id="slot0" dblink="UI:TEMP:CHARSLOT0" posref="TL TL" x="2" y="-95"/>
<instance template="char_slot_view" id="slot1" dblink="UI:TEMP:CHARSLOT1" posref="TL TL" x="207" y="-65"/> <instance template="char_slot_view" id="slot1" dblink="UI:TEMP:CHARSLOT1" posref="TL TL" x="207" y="-65"/>
<instance template="char_slot_view" id="slot2" dblink="UI:TEMP:CHARSLOT2" posref="TL TL" x="412" y="-35"/> <instance template="char_slot_view" id="slot2" dblink="UI:TEMP:CHARSLOT2" posref="TL TL" x="412" y="-35"/>
<instance template="char_slot_view" id="slot3" dblink="UI:TEMP:CHARSLOT3" posref="TL TL" x="617" y="-65"/> <instance template="char_slot_view" id="slot3" dblink="UI:TEMP:CHARSLOT3" posref="TL TL" x="617" y="-65"/>
@ -514,26 +484,25 @@
<instance template="empty_slot_view" id="empty_slot3" posref="TL TL" x="617" y="-65"/> <instance template="empty_slot_view" id="empty_slot3" posref="TL TL" x="617" y="-65"/>
<instance template="empty_slot_view" id="empty_slot4" posref="TL TL" x="822" y="-95"/> <instance template="empty_slot_view" id="empty_slot4" posref="TL TL" x="822" y="-95"/>
-->
<!-- Button of each character slot (always present even if empty slot) --> <!-- Button of each character slot (always present even if empty slot) -->
<ctrl style="menu_button" id="but_slot0" posref="TL TL" x="150" y="-150" <ctrl style="menu_button" id="but_slot0" posref="TL TL" x="2" y="-95"
onover="play_sound" params_over="name=specie_but_over" onover="play_sound" params_over="name=specie_but_over"
onclick_l="proc" params_l="proc_charsel_clickslot|0" /> onclick_l="proc" params_l="proc_charsel_clickslot|0" />
<ctrl style="menu_button" id="but_slot1" posref="TR TL" posparent="but_slot0" x="-199" y="-20" <ctrl style="menu_button" id="but_slot1" posref="TR TL" posparent="but_slot0" x="5" y="30"
onover="play_sound" params_over="name=specie_but_over" onover="play_sound" params_over="name=specie_but_over"
onclick_l="proc" params_l="proc_charsel_clickslot|1" /> onclick_l="proc" params_l="proc_charsel_clickslot|1" />
<ctrl style="menu_button" id="but_slot2" posref="TR TL" posparent="but_slot1" x="-199" y="-20" <ctrl style="menu_button" id="but_slot2" posref="TR TL" posparent="but_slot1" x="5" y="30"
onover="play_sound" params_over="name=specie_but_over" onover="play_sound" params_over="name=specie_but_over"
onclick_l="proc" params_l="proc_charsel_clickslot|2" /> onclick_l="proc" params_l="proc_charsel_clickslot|2" />
<ctrl style="menu_button" id="but_slot3" posref="TR TL" posparent="but_slot2" x="-199" y="-20" <ctrl style="menu_button" id="but_slot3" posref="TR TL" posparent="but_slot2" x="5" y="-30"
onover="play_sound" params_over="name=specie_but_over" onover="play_sound" params_over="name=specie_but_over"
onclick_l="proc" params_l="proc_charsel_clickslot|3" /> onclick_l="proc" params_l="proc_charsel_clickslot|3" />
<ctrl style="menu_button" id="but_slot4" posref="TR TL" posparent="but_slot3" x="-199" y="-20" <ctrl style="menu_button" id="but_slot4" posref="TR TL" posparent="but_slot3" x="5" y="-30"
onover="play_sound" params_over="name=specie_but_over" onover="play_sound" params_over="name=specie_but_over"
onclick_l="proc" params_l="proc_charsel_clickslot|4" /> onclick_l="proc" params_l="proc_charsel_clickslot|4" />
@ -543,35 +512,25 @@
<!-- BOTTOM BUTTON --> <!-- BOTTOM BUTTON -->
<!--***************--> <!--***************-->
<!-- <!-- Button to show informations about character
<ctrl type="button" id="display_infos" button_type="toggle_button" posref="BL BL" x="248" y="48" <ctrl type="button" id="display_infos" button_type="toggle_button" posref="BL BL" x="248" y="48" tx_normal="infos.tga" tx_pushed="infos.tga" tx_over="infos.tga" color="255 255 255 255" col_pushed="255 255 255 255" col_over="0 0 0 0" onover="play_sound" params_over="name=specie_but_over" onclick_l="proc" params_l="proc_charsel_infos"/>
tx_normal="infos.tga" tx_pushed="infos.tga" tx_over="infos.tga"
color="255 255 255 255" col_pushed="255 255 255 255" col_over="0 0 0 0"
onover="play_sound" params_over="name=specie_but_over"
onclick_l="proc" params_l="proc_charsel_infos"/>
-->
<!--
<ctrl style="valid_txt_button" id="infos_but" posref="BL BL" x="248" y="48" hardtext="uiCP_Infos"
onover="play_sound" params_over="name=specie_but_over"
onclick_l="proc" params_l="proc_charsel_infos"/>
<ctrl style="valid_txt_button" id="infos_but" posref="BL BL" x="248" y="48" hardtext="uiCP_Infos" onover="play_sound" params_over="name=specie_but_over" onclick_l="proc" params_l="proc_charsel_infos"/>
<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" onclick_l="proc" params_l="proc_charsel_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"
onclick_l="proc" params_l="proc_charsel_play"/>
-->
<!-- Buttons to play with the character + delete it / Button to create a character if slot empty --> <!-- Buttons to play with the character + delete it / Button to create a character if slot empty -->
<group id="buttonsgroup" render_layer="3" posref="TR TR" x="-90" y="-300" w="160" h="320" > <group id="buttonsgroup" render_layer="3" posref="TR TR" x="-90" y="-250" w="160" h="320" >
<view type="bitmap" id="bg" posref="TL TL" x="0" y="0" render_layer="3" scale="true" w="160" h="320" <view type="bitmap" id="bg" posref="TL TL" x="0" y="0" render_layer="3" scale="true" w="160" h="320"
color="0 0 0 0" global_color="false" /> color="0 0 0 0" global_color="false" />
<!-- TITLE --> <!-- TITLE -->
<group id="title" posref="MT MT"> <group id="title" posref="MT MT">
<view type="text" id="title2" posref="TM TM" global_color="false" render_layer="3" fontsize="20" shadow="false" y="-10" hardtext="uiCP_selection"/> <view type="text" id="title2" posref="TM TM" global_color="false" render_layer="3" fontsize="20" shadow="false" y="-15" hardtext="uiCP_selection"/>
<view type="text" id="title1" posref="TM TM" global_color="false" render_layer="3" fontsize="20" shadow="false" y="-35" hardtext="uiCP_title1"/> <view type="text" id="title1" posref="TM TM" global_color="false" render_layer="3" fontsize="20" shadow="false" y="-40" hardtext="uiCP_title1"/>
</group> </group>
@ -604,40 +563,30 @@
<ctrl style="valid_txt_button" id="quit_but" posref="BM BM" render_layer="3" y="10" hardtext="uiCharSel_Quit" <ctrl style="valid_txt_button" id="quit_but" posref="BM BM" render_layer="3" y="10" hardtext="uiCharSel_Quit"
onover="play_sound" params_over="name=specie_but_over" onover="play_sound" params_over="name=specie_but_over"
onclick_l="proc" params_l="proc_quit"/> onclick_l="proc" params_l="proc_quit"/>
<!-- QUIT BUTTON CROSS BOTTOM RIGHT <!-- QUIT BUTTON CROSS BOTTOM RIGHT
<ctrl type="button" id="quit_but" button_type="push_button" posref="TR TR" x="0" y="0" <ctrl type="button" id="quit_but" button_type="push_button" posref="TR TR" x="0" y="0"
tx_normal="quit.tga" tx_pushed="quit.tga" tx_over="quit.tga" tx_normal="quit.tga" tx_pushed="quit.tga" tx_over="quit.tga"
color="255 255 255 255" col_pushed="255 255 255 255" col_over="0 0 0 0" color="255 255 255 255" col_pushed="255 255 255 255" col_over="0 0 0 0"
onover="play_sound" params_over="name=specie_but_over" onover="play_sound" params_over="name=specie_but_over"
onclick_l="proc" params_l="proc_quit"/> --> onclick_l="proc" params_l="proc_quit"/> -->
</group> </group>
<!--
<group id="bgd_progress" posref="BM BM" w="430" h="75" x="85" y="65" active="true"> <!-- <group id="bgd_progress" posref="BM BM" w="430" h="75" x="85" y="65" active="true">
<instance template="outgame_black_back" id="border"/> <instance template="outgame_black_back" id="border"/>
<view type="text" id="text" active="true" y="-10" posref="TM TM" hardtext="" fontsize="13" color="255 255 255 255"/> <view type="text" id="text" active="true" y="-10" posref="TM TM" hardtext="" fontsize="13" color="255 255 255 255"/>
<view type="bitmap" id="bm" active="false" y="1" x="-1" texture="W_answer_16_valid.tga" posparent="text" posref="ML MR"/> <view type="bitmap" id="bm" active="false" y="1" x="-1" texture="W_answer_16_valid.tga" posparent="text" posref="ML MR"/>
<view type="text" id="ellipsis" active="true" y="0" posref="BR BL" posparent="text" hardtext="" fontsize="13" color="255 255 255 255"/> <view type="text" id="ellipsis" active="true" y="0" posref="BR BL" posparent="text" hardtext="" fontsize="13" color="255 255 255 255"/>
<view type="bar" id="progress" active="true" posparent="text" x="-8" posref="BM TM" y="-4"/> <view type="bar" id="progress" active="true" posparent="text" x="-8" posref="BM TM" y="-4"/>
<group type="combo_box" id="prio" sizeref="w" w="64" x="0" y="-8" child_resize_h="true" child_resize_hmargin="6" linked_to_db="false" <group type="combo_box" id="prio" sizeref="w" w="64" x="0" y="-8" child_resize_h="true" child_resize_hmargin="6" linked_to_db="false" posparent="progress" posref="BM TM" on_change="lua:bgdownloader:onChangePriority()" on_change_params="" tooltip="uiBGD_PriorityTooltip" global_color="false">
posparent="progress"
posref="BM TM"
on_change="lua:bgdownloader:onChangePriority()" on_change_params=""
tooltip="uiBGD_PriorityTooltip"
global_color="false"
>
<instance template="combo_box_def1" tooltip="uiBGD_PriorityTooltip"/> <instance template="combo_box_def1" tooltip="uiBGD_PriorityTooltip"/>
<combo_text name="uiBGD_Paused" /> <combo_text name="uiBGD_Paused" />
<combo_text name="uiBGD_LowPriority" /> <combo_text name="uiBGD_LowPriority" />
<combo_text name="uiBGD_NormalPriority" /> <combo_text name="uiBGD_NormalPriority" />
</group> </group>
</group> </group>-->
-->
<!--*************--> <!--*************-->
<!-- SKIN BANNER --> <!-- SKIN BANNER -->
@ -646,19 +595,16 @@
<view type="bitmap" id="skin_banner" posref="BL BL" x="0" y="0" render_layer="-1" texture="blank.tga" <view type="bitmap" id="skin_banner" posref="BL BL" x="0" y="0" render_layer="-1" texture="blank.tga"
color="255 255 255 255" global_color="false" /> color="255 255 255 255" global_color="false" />
<!-- MODAL BLACK SCREEN --> <!-- MODAL BLACK SCREEN -->
<view type="bitmap" id="infos_screen" x="-3" y="-3" w="815" h="762" posref="TR TR" render_layer="1" texture="blank.tga" color="0 0 0 160" <view type="bitmap" id="infos_screen" x="-3" y="-3" w="815" h="762" posref="TR TR" render_layer="1" texture="blank.tga" color="0 0 0 160"
scale="true" global_color="false" /> scale="true" global_color="false" />
<link expr="eq(@UI:TEMP:INFOS, 1)" target="infos_screen:active" /> <link expr="eq(@UI:TEMP:INFOS, 1)" target="infos_screen:active" />
<!-- SKIN --> <!-- SKIN -->
<view type="bitmap" id="skin" posref="TL TL" x="0" y="0" render_layer="2" texture="outgame_skin.tga" <view type="bitmap" id="skin" posref="TL TL" x="0" y="0" render_layer="2" texture="outgame_skin.tga"
color="255 255 255 255" global_color="false" /> color="255 255 255 255" global_color="false" />
<!-- SKIN MENU SELECTION 1 --> <!-- SKIN MENU SELECTION 1 -->
<view type="bitmap" id="select_menu" posref="BL BL" x="-3" y="-3" render_layer="4" scale="true" texture="blank.tga" <view type="bitmap" id="select_menu" posref="BL BL" x="-3" y="-3" render_layer="4" scale="true" texture="blank.tga"
color="0 0 0 0" w="212" h="160" /> color="0 0 0 0" w="212" h="160" />
@ -669,12 +615,11 @@
ambient="0 0 0" sun_ambient="0 0 0" sun_diffuse="0 0 0" sun_specular="0 0 0" sun_direction="-1.0 1.0 -1.0" > ambient="0 0 0" sun_ambient="0 0 0" sun_diffuse="0 0 0" sun_specular="0 0 0" sun_direction="-1.0 1.0 -1.0" >
<camera id="cam" fov="70" pos="0 -3 0" target="0.0 0.0 0.0" roll="0" /> <camera id="cam" fov="70" pos="0 -3 0" target="0.0 0.0 0.0" roll="0" />
<fx id="select_fx" pos="2.0 0.0 1.5" name="sfx_interface_selectioncadre.ps" rot="0.0 0.0 0.0" /> <fx id="select_fx" pos="2.0 0.0 1.5" name="sfx_interface_selectioncadre_kha.ps" rot="0.0 0.0 0.0" />
</scene3d> </scene3d>
<!-- 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" />
@ -692,7 +637,6 @@
onclick_l="leave_modal" /> onclick_l="leave_modal" />
</group> </group>
<!-- PATCH INFORMATIONS TODO CHECK ITS DISPLAY <!-- PATCH INFORMATIONS TODO CHECK ITS DISPLAY
<group id="webstart" posref="BR BR" x="-50" y="45" w="100" h="40" active="true" > <group id="webstart" posref="BR BR" x="-50" y="45" w="100" h="40" active="true" >
<group id="content" x="0" y="0" w="100" h="60" posref="MM MM" > <group id="content" x="0" y="0" w="100" h="60" posref="MM MM" >
@ -751,18 +695,13 @@
</group> </group>
</template> </template>
--> -->
<group type="modal" id="r2ed_editor_new_sceneario_warning" w="300" h="200" <group type="modal" id="r2ed_editor_new_sceneario_warning" w="300" h="200" posref="MM MM" render_layer="1"
posref="MM MM" render_layer="1" mouse_pos="false" escapable="false" exit_click_out="true" display="false" >
mouse_pos="false" escapable="false" exit_click_out="true"
display="false"
>
<instance template="outgame_popup" id="back" posref="TL TL" /> <instance template="outgame_popup" id="back" posref="TL TL" />
<view type="text" id="text" posref="TM TM" x="0" y="-60" color="255 255 255 255" global_color="false" line_maxw="284" <view type="text" id="text" posref="TM TM" x="0" y="-60" color="255 255 255 255" global_color="false" line_maxw="284"
fontsize="17" shadow="true" hardtext="uiR2EDNewScenarioWarning" multi_line="true" multi_line_space="0"/> fontsize="17" shadow="true" hardtext="uiR2EDNewScenarioWarning" multi_line="true" multi_line_space="0"/>
<ctrl style="valid_txt_button" id="submit" posref="BM BM" x="0" y="8" hardtext="uittOK" <ctrl style="valid_txt_button" id="submit" posref="BM BM" x="0" y="8" hardtext="uittOK"
onover="play_sound" params_over="name=specie_but_over" onover="play_sound" params_over="name=specie_but_over"
onclick_l="proc" params_l="proc_charsel_new_scenario" /> onclick_l="proc" params_l="proc_charsel_new_scenario" />
@ -773,7 +712,6 @@
</group> </group>
<options name="menu_back"> <options name="menu_back">
<param name="tx_tl" value="CM_TL.tga" /> <param name="tx_tl" value="CM_TL.tga" />
@ -788,27 +726,13 @@
</options> </options>
<group type="menu" id="r2ed_editor_menu" options="menu_back" text_y="-2" color="255 255 255 255" fontsize="16" shadow="true" shadow_color="0 0 0 255" shadow_color_over="0 0 0 255" color_over="0 0 0 255" color_grayed="255 255 255 128" shadow_color_grayed="0 0 0 255" highlight_over="255 255 255 128" mouse_pos="false">
<group type="menu" id="r2ed_editor_menu"
options="menu_back"
text_y="-2"
color="255 255 255 255"
fontsize="16"
shadow="true"
shadow_color="0 0 0 255"
shadow_color_over="0 0 0 255"
color_over="0 0 0 255"
color_grayed="255 255 255 128"
shadow_color_grayed="0 0 0 255"
highlight_over="255 255 255 128"
mouse_pos="false">
<action id="new_scenario" name="uiR2EDNewScenario" handler="proc" params="proc_charsel_new_scenario_warning" /> <action id="new_scenario" name="uiR2EDNewScenario" handler="proc" params="proc_charsel_new_scenario_warning" />
<action id="new_scenario" name="uiR2EDEditScenario" handler="proc" params="proc_charsel_edit_scenario"/> <action id="new_scenario" name="uiR2EDEditScenario" handler="proc" params="proc_charsel_edit_scenario"/>
</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_select)" target="charsel:active" /> <link expr="eq(@UI:CURRENT_SCREEN, %screen_select)" target="charsel:active" />
@ -874,12 +798,12 @@
<anim id="anim_sel_select_fx" duration="2.0" disable_buttons="false" on_finish="proc" on_finish_params="restart_sel_select_fx" > <anim id="anim_sel_select_fx" duration="2.0" disable_buttons="false" on_finish="proc" on_finish_params="restart_sel_select_fx" >
<!--<track type="bezier" target="charsel:3d_select:select_fx:posx" > <track type="bezier" target="charsel:3d_select:select_fx:posx" >
<key time="0.0" value="1.5" intan="-0.1" outtan="-0.1" step="6" /> <key time="0.0" value="2" intan="-0.1" outtan="-0.1" step="6" />
<key time="0.5" value="0" intan="6" outtan="-6" step="6" /> <key time="0.5" value="0" intan="8" outtan="-8" step="6" />
<key time="1" value="-1.5" intan="0.1" outtan="0.1" step="6" /> <key time="1" value="-2" intan="0.1" outtan="0.1" step="6" />
<key time="1.5" value="0" intan="-6" outtan="6" step="6" /> <key time="1.5" value="0" intan="-8" outtan="8" step="6" />
<key time="2.0" value="1.5" intan="-0.1" outtan="-0.1" step="6" /> <key time="2.0" value="2" intan="-0.1" outtan="-0.1" step="6" />
</track> </track>
<track type="bezier" target="charsel:3d_select:select_fx:posz" > <track type="bezier" target="charsel:3d_select:select_fx:posz" >
@ -888,26 +812,10 @@
<key time="1" value="0" intan="6" outtan="-6" step="6" /> <key time="1" value="0" intan="6" outtan="-6" step="6" />
<key time="1.5" value="-1.5" intan="0.1" outtan="0.1" step="6" /> <key time="1.5" value="-1.5" intan="0.1" outtan="0.1" step="6" />
<key time="2.0" value="0" intan="-6" outtan="6" step="6" /> <key time="2.0" value="0" intan="-6" outtan="6" step="6" />
</track> -->
<track type="bezier" target="charsel:3d_select:select_fx:posx" >
<key time="0.0" value="1.5" intan="-0.1" outtan="-0.1" step="6" />
<key time="0.5" value="0" intan="6" outtan="-6" step="6" />
<key time="1" value="-1.5" intan="0.1" outtan="0.1" step="6" />
<key time="1.5" value="0" intan="-6" outtan="6" step="6" />
<key time="2.0" value="1.5" intan="-0.1" outtan="-0.1" step="6" />
</track>
<track type="bezier" target="charsel:3d_select:select_fx:posz" >
<key time="0.0" value="0" intan="-0.1" outtan="0.1" step="6" />
<key time="0.5" value="0" intan="-0.1" outtan="-0.1" step="6" />
<key time="1" value="0" intan="0.1" outtan="-0.1" step="6" />
<key time="1.5" value="0" intan="0.1" outtan="0.1" step="6" />
<key time="2.0" value="0" intan="-0.1" outtan="0.1" step="6" />
</track> </track>
</anim> </anim>
<proc id="proc_browse_faq" > <proc id="proc_browse_faq" >
<!-- <!--
NB : do not leave the window here, this way the user can refer to the message in the help message box NB : do not leave the window here, this way the user can refer to the message in the help message box
@ -916,21 +824,12 @@
<action handler="browse_faq" params=""/> <action handler="browse_faq" params=""/>
</proc> </proc>
<proc id="proc_message_box_with_help_ok" > <proc id="proc_message_box_with_help_ok" >
<action handler="leave_modal" /> <!-- must leave modal first if another modal is to be displayed after this one --> <action handler="leave_modal" /> <!-- must leave modal first if another modal is to be displayed after this one -->
<action handler="" params=""/> <action handler="" params=""/>
</proc> </proc>
<group type="modal" id="message_box_with_help" exit_click_out="false" posparent="charsel:char3d" posref="MM MM" w="250" child_resize_h="true" child_resize_hmargin="100" on_enter="proc" on_enter_params="proc_message_box_with_help_ok" on_deactive="proc" on_deactive_params="proc_message_box_with_help_ok" escapable="true" mouse_pos="false" display="false" >
<group type="modal" id="message_box_with_help" exit_click_out="false" posparent="charsel:char3d" posref="MM MM" w="250" child_resize_h="true" child_resize_hmargin="100"
on_enter="proc" on_enter_params="proc_message_box_with_help_ok"
on_deactive = "proc" on_deactive_params="proc_message_box_with_help_ok"
escapable="true"
mouse_pos="false"
display="false"
>
<instance template="outgame_popup" id="back" posref="TL TL" /> <instance template="outgame_popup" id="back" posref="TL TL" />
<view type="text" id="text" posref="TL TL" line_maxw="234" x="8" y="-56" w="0" h="0" color="255 255 255 255" fontsize="12" shadow="true" multi_line="true" multi_line_space="0" case_mode="%case_first_sentence_letter_up"/> <view type="text" id="text" posref="TL TL" line_maxw="234" x="8" y="-56" w="0" h="0" color="255 255 255 255" fontsize="12" shadow="true" multi_line="true" multi_line_space="0" case_mode="%case_first_sentence_letter_up"/>
@ -945,8 +844,4 @@
onclick_l="proc" params_l="proc_browse_faq"/> onclick_l="proc" params_l="proc_browse_faq"/>
</group> </group>
</interface_config> </interface_config>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 MiB

After

Width:  |  Height:  |  Size: 3 MiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 256 KiB

Binary file not shown.

Binary file not shown.

BIN
data/kh/kh_sfx/zo_flare.ps Normal file

Binary file not shown.