Khaganat-NeL/khanat-client-data-NeL
2
0
Fork 0
Code Issues 15 Pull requests Projects Releases Packages Wiki Activity

merge data

Browse source
This commit is contained in:
deed 2019-04-18 12:20:29 +02:00
parent 3d9925ec8e
commit 885fda347c
21 changed files with 1937 additions and 1293 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

126
data/kh/kh_interfaces/bot_chat_v4.xml
View file

@ -436,6 +436,9 @@
<variable entry="UI:TEMP:GUILD:BACK:NAME" <variable entry="UI:TEMP:GUILD:BACK:NAME"
type="sint64" type="sint64"
value="0" /> value="0" />
<variable entry="UI:VARIABLES:GUILD_COST" type="sint32"
value="100000" />
<!-- INIT FLAGS CREATION PARAMS --> <!-- INIT FLAGS CREATION PARAMS -->
<proc id="init_guild_creation"> <proc id="init_guild_creation">
<action handler="set" <action handler="set"
@ -466,7 +469,7 @@
<group id="bot_chat_create_guild" <group id="bot_chat_create_guild"
style="bot_chat_window" style="bot_chat_window"
posref="BL TL" posref="BL TL"
w="254" w="400"
x="352" x="352"
y="200" y="200"
active="false" active="false"
@ -488,7 +491,7 @@
h="16" h="16"
posref="TL TL"></group> posref="TL TL"></group>
<group id="content" <group id="content"
w="246" w="398"
child_resize_h="true" child_resize_h="true"
child_resize_hmargin="4" child_resize_hmargin="4"
x="0" x="0"
@ -498,40 +501,19 @@
<instance template="bc_border_text" <instance template="bc_border_text"
id="intro" id="intro"
w="0" w="0"
y="-4" y="0"
text_id="SERVER:BOTCHAT:CREATE_GUILD" /> text_id="SERVER:BOTCHAT:CREATE_GUILD" />
<!-- GUILD ICON -->
<ctrl type="sheet"
id="blason"
posref="BL TL"
x="0"
y="-16"
posparent="intro"
nature="guild_flag"
value="UI:TEMP:GUILD_CREATION"
dragable="false"
color="255 255 255 255" />
<view type="text"
id="guild_blason"
posref="TL BL"
posparent="blason"
x="0"
y="0"
color="255 255 255 255"
fontsize="10"
shadow="true"
hardtext="uiGuildBlason" />
<!-- NAME OF GUILD --> <!-- NAME OF GUILD -->
<instance template="edit_box_widget" <instance template="edit_box_widget"
id="edit" id="edit"
posparent="blason" posparent="intro"
posref="MR ML" posref="TL TL"
x="4" x="0"
w="200" w="380"
y="0" y="-24"
h="20" h="12"
text_x="0" text_x="0"
text_y="-1" text_y="0"
text_ref="ML ML" text_ref="ML ML"
fontsize="12" fontsize="12"
prompt="" prompt=""
@ -543,13 +525,15 @@
enter_recover_focus="false" enter_recover_focus="false"
reset_focus_on_hide="true" reset_focus_on_hide="true"
max_historic="0" max_historic="0"
title="uiGuildNameWarning"
tooltip="uiGuildNameWarning"
entry_type="text" /> entry_type="text" />
<view type="text" <view type="text"
id="guild_name" id="guild_name"
posparent="edit" posparent="edit"
posref="TL BL" posref="TL BL"
x="0" x="0"
y="5" y="0"
color="255 255 255 255" color="255 255 255 255"
fontsize="10" fontsize="10"
shadow="true" shadow="true"
@ -558,11 +542,15 @@
<instance template="edit_box_widget" <instance template="edit_box_widget"
id="desc" id="desc"
posref="BL TL" posref="BL TL"
multi_line="true"
max_num_chars="200"
y="-24" y="-24"
posparent="blason" posparent="edit"
child_resize_h="true" child_resize_h="true"
w="238" w="380"
onenter="" /> onenter=""
title="uiGuildDescWarning"
tooltip="uiGuildDescWarning" />
<view type="text" <view type="text"
id="guild_desc" id="guild_desc"
posparent="desc" posparent="desc"
@ -578,10 +566,32 @@
id="back" id="back"
posparent="desc" posparent="desc"
posref="BM TM" posref="BM TM"
w="180" w="300"
h="77" h="120"
x="0" x="0"
y="-24" /> y="-24" />
<!-- GUILD ICON -->
<ctrl type="sheet"
id="blason"
posref="TL TL"
x="5"
y="-18"
posparent="back"
nature="guild_flag"
value="UI:TEMP:GUILD_CREATION"
dragable="false"
color="255 255 255 255" />
<view type="text"
id="guild_blason"
posref="TL BL"
posparent="blason"
x="0"
y="0"
color="255 255 255 255"
fontsize="10"
shadow="true"
hardtext="uiGuildBlason" />
<!-- GUILD ICON Desinger -->
<view type="text" <view type="text"
id="guild_blason_design" id="guild_blason_design"
posref="TL BL" posref="TL BL"
@ -595,7 +605,7 @@
<ctrl type="sheet" <ctrl type="sheet"
id="back_layer" id="back_layer"
posref="TL TL" posref="TL TL"
x="4" x="100"
y="-18" y="-18"
posparent="back" posparent="back"
nature="guild_flag" nature="guild_flag"
@ -603,13 +613,6 @@
global_color="false" global_color="false"
onclick_l="enter_modal" onclick_l="enter_modal"
params_l="group=ui:interface:guild_flag_back" /> params_l="group=ui:interface:guild_flag_back" />
<view type="bitmap"
id="fore_sheet"
posparent="back_layer"
posref="TR TL"
x="4"
y="0"
texture="W_slot_blason.tga" />
<view type="text" <view type="text"
id="blason_back" id="blason_back"
posref="TL BL" posref="TL BL"
@ -623,9 +626,9 @@
<view type="text" <view type="text"
id="blason_fore" id="blason_fore"
posref="TL BL" posref="TL BL"
posparent="fore_sheet" posparent="back"
x="0" x="100"
y="0" y="-80"
color="255 255 255 255" color="255 255 255 255"
fontsize="10" fontsize="10"
shadow="true" shadow="true"
@ -633,8 +636,9 @@
<ctrl type="button" <ctrl type="button"
button_type="push_button" button_type="push_button"
id="fore_flag" id="fore_flag"
posparent="fore_sheet" posparent="blason_fore"
posref="TL TL" posref="TL TL"
y="-16"
tx_normal="W_slot_blason_over.tga" tx_normal="W_slot_blason_over.tga"
tx_over="W_slot_blason_over.tga" tx_over="W_slot_blason_over.tga"
tx_pushed="W_slot_blason_over.tga" tx_pushed="W_slot_blason_over.tga"
@ -648,9 +652,9 @@
id="fore_layer" id="fore_layer"
posref="TL TL" posref="TL TL"
x="1" x="1"
y="-1" y="-16"
render_layer="5" render_layer="5"
posparent="fore_sheet" posparent="blason_fore"
texture="Guild_Symbol_S_08.tga" texture="Guild_Symbol_S_08.tga"
scale="true" scale="true"
w="32" w="32"
@ -663,7 +667,7 @@
tooltip="uiGuildBlasonColor1" tooltip="uiGuildBlasonColor1"
posref="TL TL" posref="TL TL"
posparent="back" posparent="back"
x="80" x="150"
y="-19" /> y="-19" />
<instance template="tgcw_color2" <instance template="tgcw_color2"
id="col_2" id="col_2"
@ -678,21 +682,29 @@
id="negative" id="negative"
text="uiNegativeSymbol" text="uiNegativeSymbol"
posparent="back" posparent="back"
posref="BM BM" posref="BL BL"
x="0" x="150"
y="4" /> y="15" />
<group id="pipo" <group id="pipo"
w="238" w="390"
h="8" h="8"
x="0" x="0"
y="0" y="0"
posparent="back" posparent="back"
posref="BM TM" /> posref="BM TM" />
<instance template="argent"
id="GuildCreatMoney"
posparent="pipo"
posref="BL TL"
x="5"
y="-14"
tooltip="uiGuildCostInfo"
value="UI:VARIABLES:GUILD_COST" />
<instance template="button_ok_cancel" <instance template="button_ok_cancel"
posparent="pipo" posparent="pipo"
posref="BR TR" posref="BR TR"
x="-4" x="-4"
y="-4" y="-14"
ok_text="uiBotCreateGuild" ok_text="uiBotCreateGuild"
onclick_ok="enter_guild_creation" onclick_ok="enter_guild_creation"
onclick_ok_param="guild=ui:interface:bot_chat_create_guild:content:edit:eb|icon=ui:interface:bot_chat_create_guild:content:blason|desc=ui:interface:bot_chat_create_guild:content:desc:eb" onclick_ok_param="guild=ui:interface:bot_chat_create_guild:content:edit:eb|icon=ui:interface:bot_chat_create_guild:content:blason|desc=ui:interface:bot_chat_create_guild:content:desc:eb"

18
data/kh/kh_interfaces/game_config.xml
View file

@ -529,10 +529,8 @@
posref="TL TL" posref="TL TL"
group_onclick_r="active_menu" group_onclick_r="active_menu"
group_params_r="menu=ui:interface:base_menu_with_color"> group_params_r="menu=ui:interface:base_menu_with_color">
<!--
<view type="text_number" id="fps" posref="MR MR" x="-20" y="-2" color="255 255 255 255" shadow="true" fontsize="10" value="UI:VARIABLES:FPS" global_color="false" positive="true"/> <view type="text_number" id="fps" posref="MR MR" x="-20" y="-2" color="255 255 255 255" shadow="true" fontsize="10" value="UI:VARIABLES:FPS" global_color="false" positive="true"/>
<view type="text" id="fpstext" posref="MR MR" x="-40" y="-2" color="255 255 255 255" shadow="true" fontsize="10" global_color="false" positive="true" hardtext="uiFPS" /> <view type="text" id="fpstext" posref="MR MR" x="-40" y="-2" color="255 255 255 255" shadow="true" fontsize="10" global_color="false" positive="true" hardtext="uiFPS" />
-->
</group> </group>
<group id="content" <group id="content"
x="0" x="0"
@ -878,10 +876,17 @@
posparent="lum" posparent="lum"
x="0" x="0"
y="-2" /> y="-2" />
<instance template="tgcw_scrollbarfloat"
id="scale"
text="uiInterfaceScale"
posref="BL TL"
posparent="gam"
x="0"
y="-2" />
<instance template="tgcw_checkbox" <instance template="tgcw_checkbox"
id="waitvbl" id="waitvbl"
text="uiWaitVBL" text="uiWaitVBL"
posparent="gam" posparent="scale"
posref="BL TL" posref="BL TL"
x="-20" x="-20"
y="-28" /> y="-28" />
@ -3093,6 +3098,13 @@
realtime="true" realtime="true"
widget="sbfloat" widget="sbfloat"
link="Gamma" /> link="Gamma" />
<param ui="general:scale:c"
type="cfg"
realtime="false"
ui_view="general:scale:c_res"
ui_decimal="2"
widget="sbfloat"
link="InterfaceScale" />
<param ui="general:waitvbl:c" <param ui="general:waitvbl:c"
type="cfg" type="cfg"
realtime="true" realtime="true"

5
data/kh/kh_interfaces/help.xml
View file

@ -865,7 +865,7 @@
</group> </group>
</group> </group>
<define id="cs_url" <define id="cs_url"
value="https://khaganat.net/wikhan/fr:error" /> value="https://app.khaganat.net/ams/" />
<group type="container" <group type="container"
id="cs_browser" id="cs_browser"
w="410" w="410"
@ -906,7 +906,6 @@
group_params_r="menu=ui:interface:base_menu_with_color" group_params_r="menu=ui:interface:base_menu_with_color"
on_active="lua" on_active="lua"
on_active_params="help:openCSBrowserHeader('cs_browser')"> on_active_params="help:openCSBrowserHeader('cs_browser')">
</group> </group>
<group id="content" <group id="content"
x="0" x="0"
@ -2830,7 +2829,7 @@
global_color_normal="true" global_color_normal="true"
global_color_over="true" global_color_over="true"
global_color_pushed="true" global_color_pushed="true"
text_y="-0" text_y="0"
fontsize="10" fontsize="10"
shadow="true" shadow="true"
case_mode="%case_upper" case_mode="%case_upper"

14
data/kh/kh_interfaces/hierarchy.xml
View file

@ -110,15 +110,15 @@
<tree node="connection"/> <tree node="connection"/>
<tree node="keys" > <tree node="keys" >
<tree node="keys_movement"/> <tree node="keys_player"/>
<tree node="keys_view"/> <tree node="keys_movement"/>
<tree node="keys_actionbar"/> <tree node="keys_actions"/>
<tree node="keys_fight"/>
<tree node="keys_chat"/> <tree node="keys_chat"/>
<tree node="keys_edit"/> <tree node="keys_view"/>
<tree node="keys_windows"/> <tree node="keys_windows"/>
<tree node="keys_miscellaneous"/> <tree node="keys_system"/>
<tree node="keys_debug"/> <tree node="keys_edit"/>
<tree node="keys_debug"/>
</tree> </tree>
<!-- done with template teditcmd now <tree node="editkey" />--> <!-- done with template teditcmd now <tree node="editkey" />-->

6
data/kh/kh_interfaces/info_player.lua
View file

@ -1431,6 +1431,8 @@ function game:onInGameDbInitialized()
end end
game:setInfoPlayerCharacterRace() game:setInfoPlayerCharacterRace()
runAH(nil, "sort_tribefame", "")
end end
function game:onWebIgReady() function game:onWebIgReady()
@ -1606,9 +1608,9 @@ end
function game:addRpJob(jobtype, id, value, rpjobs) function game:addRpJob(jobtype, id, value, rpjobs)
local base_path = "ui:interface:info_player_skills:content:rpjobs:rpjob_"..jobtype.."_"..id..":rpjob_"..jobtype.."_infos_"..id local base_path = "ui:interface:info_player_skills:content:rpjobs:rpjob_"..jobtype.."_"..id..":rpjob_"..jobtype.."_infos_"..id
local group = getUI("ui:interface:info_player_skills:content:rpjobs:rpjob_"..jobtype.."_"..id) local group = getUI("ui:interface:info_player_skills:content:rpjobs:rpjob_"..jobtype.."_"..id)
if (value == nil) then if (value == nil) then
group.active = false group.active = false
else else

42
data/kh/kh_interfaces/interaction.xml
View file

@ -277,6 +277,19 @@
global_color="false" global_color="false"
render_layer="1" render_layer="1"
active="true" /> active="true" />
<view type="bitmap"
id="lock"
posref="BR BR"
posparent="slot_force"
x="-5"
y="-3"
h="14"
w="14"
color="255 255 255 255"
texture="w_win_lock.tga"
global_color="false"
render_layer="3"
active="true" />
<ctrl type="tooltip" <ctrl type="tooltip"
id="target_tooltip" id="target_tooltip"
tooltip="uittConsiderTargetNoSelection" tooltip="uittConsiderTargetNoSelection"
@ -1029,7 +1042,9 @@
h="24" h="24"
posref="TL TL" posref="TL TL"
x="0" x="0"
y="-4"> y="-4"
max_w="0"
max_sizeref="w">
<ctrl style="tab_button_new" <ctrl style="tab_button_new"
id="tab0" id="tab0"
x="0" x="0"
@ -1170,6 +1185,22 @@
texture="blank.tga" texture="blank.tga"
color="166 166 166 255" /> color="166 166 166 255" />
</group> </group>
<!-- scroll target element will be set from c++ code: it does not exist on template build time -->
<ctrl type="scroll"
id="channel_scroll"
vertical="false"
align="L"
y="-1"
h="4"
scale="true"
posref="BL TL"
posparent="header_opened"
tx_bottomleft="skin_scroll_l.tga"
tx_middle="skin_scroll_h.tga"
tx_topright="skin_scroll_r.tga"
target="" />
<group id="content" <group id="content"
x="0" x="0"
y="0" y="0"
@ -3142,4 +3173,13 @@
params="game:chatUrlBrowse()" /> params="game:chatUrlBrowse()" />
</group> </group>
<group type="menu"
id="chat_copy_action_menu"
extends="base_menu">
<action id="copy"
name="uiCopy"
handler="copy_chat"
params="from_modal" />
</group>
</interface_config> </interface_config>

1
data/kh/kh_interfaces/keys.xml
View file

@ -278,6 +278,7 @@
<key name="KeyB" action="show_hide" params="phrase_book" /> <key name="KeyB" action="show_hide" params="phrase_book" />
<key name="N/A" action="show_hide" params="gestionsets" /> <key name="N/A" action="show_hide" params="gestionsets" />
<key name="KeyP" shift="1" action="show_hide" params="animal_global" /> <key name="KeyP" shift="1" action="show_hide" params="animal_global" />
<key name="N/A" action="inv_temp_all" params="" />
<!-- Map <!-- Map

1825
data/kh/kh_interfaces/login_main.xml
View file

File diff suppressed because it is too large Load diff

130
data/kh/kh_interfaces/login_widgets.xml
View file

@ -63,7 +63,7 @@
</template> </template>
<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" <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"
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"
@ -75,6 +75,11 @@
keep="true" keep="true"
max_historic="0" max_historic="0"
fontsize="10" fontsize="10"
shadow="true"
shadow_x="1"
shadow_y="1"
shadow_color="0 0 0 255"
shadow_outline="false"
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"
@ -93,14 +98,14 @@
<view type="bitmap" id="r" texture="log_eb_r.tga" posref="MR MR" scale="true" sizeref="h" h="-16" w="8" /> <view type="bitmap" id="r" texture="log_eb_r.tga" posref="MR MR" scale="true" sizeref="h" h="-16" w="8" />
<group type="edit_box" sizeref="wh" w="-8" h="-8" id="eb" posref="MM MM" on_focus="#on_focus" on_focus_params="#on_focus_params" 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"> <group type="edit_box" sizeref="wh" w="-8" h="-8" id="eb" posref="MM MM" on_focus="#on_focus" on_focus_params="#on_focus_params" 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">
<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"/> <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="#shadow" shadow_x="#shadow_x" shadow_y="#shadow_y" shadow_color="#shadow_color" shadow_outline="#shadow_outline" hardtext="" global_color="false"/>
</group> </group>
</group> </group>
</template> </template>
<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" <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"
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,17 +116,25 @@
entry_type="text" entry_type="text"
keep="true" keep="true"
max_historic="40" max_historic="40"
fontsize="10" fontsize="10"
fontweight=""
fontstyle=""
shadow="true"
shadow_x="1"
shadow_y="1"
shadow_color="0 0 0 255"
shadow_outline="false"
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" fontsize="#fontsize" color="#color" 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" multi_min_line="#multi_min_line" fontsize="#fontsize" color="#color" fontweight="#fontweight" fontstyle="#fontstyle" shadow="#shadow" shadow_x="#shadow_x" shadow_y="#shadow_y" shadow_color="#shadow_color" shadow_outline="#shadow_outline" hardtext="" global_color="false" render_layer="#render_layer"/>
</group> </group>
<!-- border around the list --> <!-- border around the list -->
@ -138,7 +151,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="-1" 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="0" 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"
@ -150,6 +163,11 @@
keep="true" keep="true"
max_historic="40" max_historic="40"
fontsize="10" fontsize="10"
shadow="true"
shadow_x="1"
shadow_y="1"
shadow_color="0 0 0 255"
shadow_outline="false"
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"
@ -159,7 +177,7 @@
<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="-8" id="eb" posref="TL TL" x="4" y="-4" 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="-8" id="eb" posref="TL TL" x="4" y="-4" 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="W_box_blank.tga" inherit_gc_alpha="true" render_layer="#render_layer"/> <view type="bitmap" id="bg" scale="true" sizeref="hw" h="0" w="0" texture="W_box_blank.tga" inherit_gc_alpha="true" 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"/> <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="#shadow" shadow_x="#shadow_x" shadow_y="#shadow_y" shadow_color="#shadow_color" shadow_outline="#shadow_outline" hardtext="" global_color="false" render_layer="#render_layer"/>
</group> </group>
<!-- border around the list --> <!-- border around the list -->
@ -179,7 +197,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="-3" fontsize="10" shadow="true" text_y="0" 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"
@ -192,10 +210,10 @@
<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="-3" fontsize="10" shadow="true" text_y="-1" fontsize="10" shadow="true"
text_color_normal="255 254 243 160" text_color_normal="135 243 28 160"
text_color_pushed="255 254 243 255" text_color_pushed="135 243 28 255"
text_color_over="255 254 243 255" text_color_over="135 243 28 255"
text_shadow_color_normal="0 0 0 255" text_shadow_color_normal="0 0 0 255"
text_shadow_color_pushed="0 0 0 255" text_shadow_color_pushed="0 0 0 255"
text_shadow_color_over="0 0 0 255" text_shadow_color_over="0 0 0 255"
@ -205,9 +223,9 @@
tx_normal="but" tx_pushed="but" tx_over="but_over" wmargin="16" wmin="552" tx_normal="but" tx_pushed="but" tx_over="but_over" wmargin="16" wmin="552"
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="-3" fontsize="10" shadow="true" text_y="-3" fontsize="10" shadow="true"
text_color_normal="255 254 243 160" text_color_normal="135 243 28 160"
text_color_pushed="255 254 243 255" text_color_pushed="135 243 28 255"
text_color_over="255 254 243 255" text_color_over="135 243 28 255"
text_shadow_color_normal="0 0 0 255" text_shadow_color_normal="0 0 0 255"
text_shadow_color_pushed="0 0 0 255" text_shadow_color_pushed="0 0 0 255"
text_shadow_color_over="0 0 0 255" text_shadow_color_over="0 0 0 255"
@ -218,9 +236,9 @@
tx_normal="serv_note" tx_pushed="serv_note" tx_over="serv_note_over" wmargin="16" tx_normal="serv_note" tx_pushed="serv_note" tx_over="serv_note_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="-3" fontsize="10" shadow="true" text_y="-3" fontsize="10" shadow="true"
text_color_normal="255 254 243 160" text_color_normal="135 243 28 160"
text_color_pushed="255 254 243 255" text_color_pushed="135 243 28 255"
text_color_over="255 254 243 255" text_color_over="135 243 28 255"
text_shadow_color_normal="0 0 0 255" text_shadow_color_normal="0 0 0 255"
text_shadow_color_pushed="0 0 0 255" text_shadow_color_pushed="0 0 0 255"
text_shadow_color_over="0 0 0 255" text_shadow_color_over="0 0 0 255"
@ -229,7 +247,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="-2" fontsize="10" shadow="true" case_mode="%case_upper" wmargin="8" text_y="0" 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" />
@ -241,7 +259,7 @@
<instance template="log_box_frame" id="bk" posref="MM MM" sizeref="wh" w="0" h="0" /> <instance template="log_box_frame" id="bk" posref="MM MM" sizeref="wh" w="0" h="0" />
<view type="text" id="text" posref="MM MM" line_maxw="420" w="420" x="0" y="12" <view type="text" id="text" posref="MM MM" line_maxw="420" w="420" x="0" y="12"
color="255 254 243 255" fontsize="12" shadow="true" multi_line="true" multi_line_space="0" case_mode="%case_first_sentence_letter_up"/> color="135 243 28 255" fontsize="12" shadow="true" multi_line="true" multi_line_space="0" case_mode="%case_first_sentence_letter_up"/>
<ctrl style="log_std_but" id="but_ok" posparent="text" posref="BM TM" y="-6" onclick_l="leave_modal" hardtext="uittOK"/> <ctrl style="log_std_but" id="but_ok" posparent="text" posref="BM TM" y="-6" onclick_l="leave_modal" hardtext="uittOK"/>
@ -276,7 +294,7 @@
<instance template="log_box_frame" id="bk" posref="MM MM" sizeref="wh" w="0" h="0" /> <instance template="log_box_frame" id="bk" posref="MM MM" sizeref="wh" w="0" h="0" />
<view type="text" id="text" posref="MM MM" line_maxw="420" w="420" x="0" y="12" <view type="text" id="text" posref="MM MM" line_maxw="420" w="420" x="0" y="12"
color="255 254 243 255" fontsize="12" shadow="true" multi_line="true" multi_line_space="0" case_mode="%case_first_sentence_letter_up"/> color="135 243 28 255" fontsize="12" shadow="true" multi_line="true" multi_line_space="0" case_mode="%case_first_sentence_letter_up"/>
<ctrl style="log_std_but" id="but_ok" posparent="text" posref="BM TL" x="2" y="-6" onclick_l="proc" params_l="proc_message_box_with_help_ok" hardtext="uittOK"/> <ctrl style="log_std_but" id="but_ok" posparent="text" posref="BM TL" x="2" y="-6" onclick_l="proc" params_l="proc_message_box_with_help_ok" hardtext="uittOK"/>
<ctrl style="log_std_but" id="but_help" posparent="text" posref="BM TR" x="-2" y="-6" onclick_l="proc" params_l="proc_browse_faq" hardtext="uittBrowseFaq"/> <ctrl style="log_std_but" id="but_help" posparent="text" posref="BM TR" x="-2" y="-6" onclick_l="proc" params_l="proc_browse_faq" hardtext="uittBrowseFaq"/>
@ -382,7 +400,7 @@
<!-- * EDIT BOX WIDGET * --> <!-- * EDIT BOX WIDGET * -->
<!-- ********************* --> <!-- ********************* -->
<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" <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"
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"
@ -394,6 +412,11 @@
keep="true" keep="true"
max_historic="40" max_historic="40"
fontsize="10" fontsize="10"
shadow="true"
shadow_x="1"
shadow_y="1"
shadow_color="0 0 0 255"
shadow_outline="false"
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"
@ -404,7 +427,7 @@
<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" fontsize="#fontsize" color="#color" 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="#shadow" shadow_x="#shadow_x" shadow_y="#shadow_y" shadow_color="#shadow_color" shadow_outline="#shadow_outline" hardtext="" global_color="false" render_layer="#render_layer"/>
</group> </group>
<!-- border around the list --> <!-- border around the list -->
@ -420,7 +443,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="-1" 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="0" 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"
@ -432,6 +455,11 @@
keep="true" keep="true"
max_historic="40" max_historic="40"
fontsize="10" fontsize="10"
shadow="true"
shadow_x="1"
shadow_y="1"
shadow_color="0 0 0 255"
shadow_outline="false"
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"
@ -441,7 +469,7 @@
<view type="bitmap" id="bg" scale="true" sizeref="hw" h="0" w="0" texture="blank.tga" color="255 255 255 0" /> <view type="bitmap" id="bg" scale="true" sizeref="hw" h="0" w="0" texture="blank.tga" color="255 255 255 0" />
<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"/> <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="#shadow" shadow_x="#shadow_x" shadow_y="#shadow_y" shadow_color="#shadow_color" shadow_outline="#shadow_outline" hardtext="" global_color="false"/>
</group> </group>
<!-- border around the list --> <!-- border around the list -->
@ -595,8 +623,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="-2" 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="0" onclick_l="#onclick_ok" params_l="#onclick_ok_param" hardtext="#ok_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" /> <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" />
</group> </group>
</template> </template>
@ -611,7 +639,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="-2" 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="0" onclick_l="#onclick" params_l="#onclick_param" hardtext="#text" color="255 255 255 200"/>
</group> </group>
</template> </template>
@ -620,7 +648,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="-2" 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="0" onclick_l="#onclick" params_l="#onclick_param" hardtext="#text" color="255 255 255 200"/>
</group> </group>
</template> </template>
@ -629,7 +657,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="-2" 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="0" onclick_l="#onclick" params_l="#onclick_param" hardtext="#text" color="255 255 255 200"/>
</group> </group>
</template> </template>
@ -826,7 +854,7 @@
> >
<view type="bitmap" posref="MM MM" id="log" texture="new_launcher_bg.tga" global_color="false" render_layer="-1" /> <view type="bitmap" posref="MM MM" id="log" texture="new_launcher_bg.tga" global_color="false" render_layer="-1" />
<view type="text" id="text" posref="MM MM" line_maxw="412" w="412" x="0" y="0" color="255 254 243 255" fontsize="18" shadow="true" multi_line="true" multi_line_space="0" case_mode="%case_first_sentence_letter_up"/> <view type="text" id="text" posref="MM MM" line_maxw="412" w="412" x="0" y="0" color="135 243 28 255" fontsize="18" shadow="true" multi_line="true" multi_line_space="0" case_mode="%case_first_sentence_letter_up"/>
<ctrl type="button" button_type="push_button" id="but_cancel" posref="BR BR" x="-304" y="157" <ctrl type="button" button_type="push_button" id="but_cancel" posref="BR BR" x="-304" y="157"
@ -955,6 +983,46 @@
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>

6
data/kh/kh_interfaces/macros.xml
View file

@ -200,7 +200,7 @@
</group> </group>
<group id="header_opened" x="0" y="0" h="20" posref="TL TL" > <group id="header_opened" x="0" y="0" h="20" posref="TL TL" >
</group> </group>
<group id="content" type="list" sizeref="w" x="0" y="0" over="true" posref="TL TL" > <group id="content" type="list" x="0" y="0" over="true" posref="TL TL" >
</group> </group>
</group> </group>
</template> </template>
@ -232,6 +232,8 @@
<group type="menu" id="options_macro" exit_click_b="true" extends="base_menu" > <group type="menu" id="options_macro" exit_click_b="true" extends="base_menu" >
<action name="uimMacroExec" handler="macros_exec" /> <action name="uimMacroExec" handler="macros_exec" />
<action name="uimMacroEdit" handler="macros_edit" /> <action name="uimMacroEdit" handler="macros_edit" />
<action name="uimMacroCopy" handler="macros_copy" />
<separator/>
<action name="uimMacroDel" handler="macros_del" /> <action name="uimMacroDel" handler="macros_del" />
</group> </group>
@ -322,6 +324,8 @@
<action name="uimMCMoveUp" handler="new_macro_cmd_move_up" /> <action name="uimMCMoveUp" handler="new_macro_cmd_move_up" />
<action name="uimMCMoveDown" handler="new_macro_cmd_move_down" /> <action name="uimMCMoveDown" handler="new_macro_cmd_move_down" />
<action name="uimMCEdit" handler="new_macro_cmd_edit" /> <action name="uimMCEdit" handler="new_macro_cmd_edit" />
<action name="uimMCCopy" handler="new_macro_cmd_copy" />
<separator/>
<action name="uimMCDel" handler="new_macro_cmd_delete" /> <action name="uimMCDel" handler="new_macro_cmd_delete" />
</group> </group>

133
data/kh/kh_interfaces/map.xml
View file

@ -2,6 +2,10 @@
<root id="interface" x="0" y="0" w="800" h="600" active="true" /> <root id="interface" x="0" y="0" w="800" h="600" active="true" />
<lua file="map.lua" />
<!-- flag for game:onLoadMap() handler to override map texture or not -->
<variable entry="UI:VARIABLES:SHOW_ALT_MAP" type="bool" value="0" />
<!-- base menu of landmark --> <!-- base menu of landmark -->
<group type="menu" id="land_mark_menu" extends="base_menu"> <group type="menu" id="land_mark_menu" extends="base_menu">
@ -25,6 +29,8 @@
<action id="teleport" name="uiTeleport" handler="map_teleport" params=""/> <action id="teleport" name="uiTeleport" handler="map_teleport" params=""/>
<action id="create_at_user_pos" name="uiCreateUserLMAtUserPos" handler="create_user_landmark_at_user_pos" params=""/> <action id="create_at_user_pos" name="uiCreateUserLMAtUserPos" handler="create_user_landmark_at_user_pos" params=""/>
<separator/> <separator/>
<action id="search" name="uiMapSearch" handler="proc" params="map_search_show"/>
<separator/>
<action id="center" name="uiMenuCenter" handler="map_center" params="map=ui:interface:map:content:map_content:actual_map"/> <action id="center" name="uiMenuCenter" handler="map_center" params="map=ui:interface:map:content:map_content:actual_map"/>
</group> </group>
@ -144,6 +150,7 @@
<!-- * USER MAP * --> <!-- * USER MAP * -->
<!-- ******************************************************************** --> <!-- ******************************************************************** -->
<variable entry="UI:VARIABLES:ISACTIVE:MAP_SEARCH" type="sint32" value="0" />
<proc id="map_proc_active"> <proc id="map_proc_active">
<action handler="set" params="dblink=UI:VARIABLES:ISACTIVE:MAP|value=1" /> <action handler="set" params="dblink=UI:VARIABLES:ISACTIVE:MAP|value=1" />
@ -155,10 +162,77 @@
<action handler="lua" params="if (r2 and r2.Mode == 'Edit') then r2.ToolUI:updateToggleWindowButtons() end" /> <action handler="lua" params="if (r2 and r2.Mode == 'Edit') then r2.ToolUI:updateToggleWindowButtons() end" />
</proc> </proc>
<proc id="map_search_toggle">
<action handler="set" params="dblink=UI:VARIABLES:ISACTIVE:MAP_SEARCH|value=not(@UI:VARIABLES:ISACTIVE:MAP_SEARCH)"/>
<action handler="proc" params="map_search_focus" cond="@UI:VARIABLES:ISACTIVE:MAP_SEARCH"/>
<action handler="proc" params="map_search_reset" cond="not(@UI:VARIABLES:ISACTIVE:MAP_SEARCH)"/>
</proc>
<proc id="map_search_focus">
<action handler="set_keyboard_focus" params="target=ui:interface:map:content:map_content:lm_search:search:eb|select_all=true" />
</proc>
<proc id="map_search_reset">
<action handler="proc" params="map_search_setfilter" />
</proc>
<proc id="map_search_show">
<action handler="set" params="dblink=UI:VARIABLES:ISACTIVE:MAP_SEARCH|value=1" />
<action handler="proc" params="map_search_focus" />
</proc>
<proc id="map_search_hide">
<action handler="set" params="dblink=UI:VARIABLES:ISACTIVE:MAP_SEARCH|value=0" />
</proc>
<proc id="map_search_setfilter">
<action handler="set" params="target_property=ui:interface:map:content:map_content:lm_search:search:eb:input_string|value='@0'" />
<action handler="land_mark_filter" params="map=ui:interface:map:content:map_content:actual_map|text=@0" />
</proc>
<!-- set search string from /mapsearch command -->
<proc id="map_search_show_set">
<action handler="set" params="dblink=UI:VARIABLES:ISACTIVE:MAP_SEARCH|value=1" />
<action handler="proc" params="map_search_setfilter|@0" />
</proc>
<!-- hide search if focus was lost and input is empty (esc key) -->
<proc id="map_search_focuslost">
<action handler="proc" params="map_search_hide"
cond="eq(getprop('ui:interface:map:content:map_content:lm_search:search:eb:input_string'),'')" />
</proc>
<proc id="map_search_onchange">
<action handler="land_mark_filter" params="map=ui:interface:map:content:map_content:actual_map|group=@0" />
</proc>
<define id="map_min_size" value="256" /> <define id="map_min_size" value="256" />
<!-- used to override onclick handler -->
<proc id="dummy_proc" />
<template name="lm_search_result" keep="true" active="true" id="" x="0" y="0" w="0" h="17" posparent="parent" posref="TL TL"
hardtext="" fontsize="10" y_text="-2" onclick_l="lua" params_l="" tooltip="" index="0">
<group id="#id" active="#active" x="#x" y="#y" w="#w" h="#h" posparent="#posparent" posref="#posref" sizeref="w">
<ctrl type="button" id="over" sizeref="wh" w="0" h="0" posref="MM MM"
scale="true" tx_normal="blank.tga" tx_over="blank.tga" color="0 0 0 0" col_over="255 255 255 127"
onclick_l="land_mark_result_selected" params_l="map=ui:interface:map:content:map_content:actual_map|index=#index"
onclick_r="proc" params_r="dummy_proc"
tooltip="#tooltip" />
<view type="bitmap" id="icon" posref="ML ML" w="16" h="16"
scale="true" color="255 255 255 255" global_color="false" texture="blank.tga" />
<view type="text" id="title" posref="TL TL" x="16" y="#y_text"
color="255 255 255 255" global_color="true" fontsize="#fontsize" shadow="true" hardtext="#hardtext"
auto_clamp="true" over_extend_view_text="false" over_extend_parent_rect="false" />
</group>
</template>
<group id="map" type="container" posref="BL TL" min_w="%map_min_size" max_w="16384" w="256" h="256" x="352" y="200" min_h="%map_min_size" max_h="16384" <group id="map" type="container" posref="BL TL" min_w="%map_min_size" max_w="16384" w="256" h="256" x="352" y="200" min_h="%map_min_size" max_h="16384"
resizer="true" pop_max_h="16384" pop_min_h="%map_min_size" pop_max_w="16384" pop_min_w="%map_min_size" resizer="true" pop_max_h="16384" pop_min_h="%map_min_size" pop_max_w="16384" pop_min_w="%map_min_size"
openable="false" opened="true" openable="false" opened="true"
@ -191,8 +265,10 @@
<!-- center on player --> <!-- center on player -->
<ctrl type="button" id="center" button_type="push_button" posparent="zoom_out" posref="TR TL" y="0" x="4" tx_normal="w_center_map.tga" tx_pushed="W_button_16_over.tga" tx_over="W_button_16_over.tga" <ctrl type="button" id="center" button_type="push_button" posparent="zoom_out" posref="TR TL" y="0" x="4" tx_normal="w_center_map.tga" tx_pushed="W_button_16_over.tga" tx_over="W_button_16_over.tga"
onclick_l="map_center" params_l="map=ui:interface:map:content:map_content:actual_map" tooltip="uittCenter" /> onclick_l="map_center" params_l="map=ui:interface:map:content:map_content:actual_map" tooltip="uittCenter" />
<ctrl type="button" id="lm_search_btn" button_type="push_button" posparent="center" posref="TR TL" y="0" x="4" tx_normal="w_help_1.tga" tx_pushed="W_button_16_over.tga" tx_over="W_button_16_over.tga"
onclick_l="proc" params_l="map_search_toggle" tooltip="uittMapSearch" />
<view type="text" id="time" x="12" y="0" posparent="center" posref="MR ML" color="255 255 255 255" fontsize="12" shadow="true" hardtext="" /> <view type="text" id="time" x="12" y="0" posparent="lm_search_btn" posref="MR ML" color="255 255 255 255" fontsize="12" shadow="true" hardtext="" />
<view type="text" id="weather" x="8" y="-16" posref="TL TL" color="255 255 255 255" fontsize="12" shadow="true" hardtext="" /> <view type="text" id="weather" x="8" y="-16" posref="TL TL" color="255 255 255 255" fontsize="12" shadow="true" hardtext="" />
<instance template="box_widget" id="back" posref="TL TL" sizeref="wh" w="-2" h="-32" x="1" y="-32" render_layer="0" /> <instance template="box_widget" id="back" posref="TL TL" sizeref="wh" w="-2" h="-32" x="1" y="-32" render_layer="0" />
@ -315,11 +391,53 @@
selection_axis_color = "0 0 0 127" selection_axis_color = "0 0 0 127"
compass="ui:interface:compass" compass="ui:interface:compass"
scale_max="2" />
scale_max_r2="8" <!-- border around the map -->
/>
<!-- border around the map --> <group id="lm_search"
posparent="back"
posref="TR TR"
sizeref="h"
x="-2"
y="-2"
h="-4"
child_resize_w="true">
<view type="bitmap" id="bg" posref="ML ML" sizeref="wh" h="25"
scale="true" color="100 100 100 120" global_color="false" texture="blank.tga" />
<instance template="edit_box_widget"
id="search"
posref="TR TR"
w="150"
clear_on_escape="true"
enter_recover_focus="false"
on_focus_lost="proc" on_focus_lost_params="map_search_focuslost"
onenter=""
onchange="proc" onchange_params="map_search_onchange|ui:interface:map:content:map_content:lm_search:search:eb" />
<ctrl type="button"
id="reset"
button_type="push_button"
posparent="search"
posref="ML MR"
x="-2"
tx_normal="w_close_0.tga"
tx_pushed="w_close_0.tga"
tx_over="W_button_16_over"
onclick_l="proc" params_l="map_search_toggle"
tooltip="" />
<view type="text" id="lm_count" posparent="search" posref="BR TR" x="-2" color="200 200 200 255" fontsize="10" shadow="true" hardtext="0" />
<group id="result" posref="TR TR" x="0" y="-25" w="0" h="-20" over="true" sizeref="wh">
<group id="rows" x="10" w="-10" y="0" sizeref="w" posref="TL TL" child_resize_h="true" child_resize_hmargin="4" max_h="0" max_sizeref="h" max_sizeparent="parent">
<group id="lm_result" type="list" x="0" y="0" posref="TL TL" sizeref="w" dynamic_display_size="true" />
</group>
<ctrl style="skin_scroll" id="sv" posref="TL TL" x="0" y="0" target="rows" />
</group>
</group>
<link expr="@UI:VARIABLES:ISACTIVE:MAP_SEARCH" target="lm_search:active" />
</group> </group>
</group> </group>
</group> </group>
@ -408,8 +526,7 @@
player_pos_tex="player_pos.tga" player_pos_tex="player_pos.tga"
scale_max="2" />
/>
<!-- border around the map --> <!-- border around the map -->
</group> </group>

369
data/kh/kh_interfaces/out_v2_appear.lua
View file

@ -3,69 +3,256 @@
------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------
-- create the game namespace without reseting if already created in an other file. -- create the game namespace without reseting if already created in an other file.
if (outgame==nil) then if (outgame == nil) then
outgame= {}; outgame = {}
end end
------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------
-- Name generator. -- Name generator.
--nb noms:
-- matis: male 621 - female 621 - FirstName 621
-- fyros: given name 14269, FirstName 841
-- zorai: given name one 318, given name two 644, FirstName 1287
-- tryker: given name 4500, FirstName 4335
-- Fyros
function outgame:getFyrosFirstName()
local nbFyrosFirstNames = #fyrosFirstNames
return fyrosFirstNames[math.random(nbFyrosFirstNames)]
end
function outgame:getFyrosLastName()
local nbFyrosLastNames = #fyrosLastNames
return fyrosLastNames[math.random(nbFyrosLastNames)]
end
-- Matis
function outgame:getMatisFirstName(sex)
-- 1 = male, 2 = female
local dbNameSex = getDbProp("UI:TEMP:NAME_SEX")
if sex ~= nil then
dbNameSex = sex
end
local FirstName = ""
if tonumber(dbNameSex) == 1 then
local nbMatisMaleFirstNames = #matisMaleFirstNames
FirstName = matisMaleFirstNames[math.random(nbMatisMaleFirstNames)]
else
local nbMatisFemaleFirstNames = #matisFemaleFirstNames
FirstName = matisFemaleFirstNames[math.random(nbMatisFemaleFirstNames)]
end
return FirstName
end
function outgame:getMatisLastName()
local nbMatisLastNames = #matisLastNames
return matisLastNames[math.random(nbMatisLastNames)]
end
-- Tryker
function outgame:getTrykerFirstName()
local nbTrykerFirstNames = #trykerFirstNames
return trykerFirstNames[math.random(nbTrykerFirstNames)]
end
function outgame:getTrykerLastName()
local nbTrykerLastNames = #trykerLastNames
return trykerLastNames[math.random(nbTrykerLastNames)]
end
-- Zora<72>
function outgame:getZoraiFirstName()
local nbFirstNamesOne = #zoraiFirstNamesOne
local FirstNameOne = zoraiFirstNamesOne[math.random(nbFirstNamesOne)]
local nbFirstNamesTwo = #zoraiFirstNamesTwo
local FirstNameTwo = zoraiFirstNamesTwo[math.random(nbFirstNamesTwo)]
return FirstNameOne .. "-" .. FirstNameTwo
end
function outgame:getZoraiLastName()
local nbLastNames = #zoraiLastNames
return zoraiLastNames[math.random(nbLastNames)]
end
function outgame:procGenerateName() function outgame:procGenerateName()
local uiNameFull = getUI("ui:outgame:appear_name:name_full"); local uiNameFull = getUI("ui:outgame:appear_name:name_full")
local uiNameDef = getUI("ui:outgame:appear_name:name_def"); local uiGenText = getUI("ui:outgame:appear_name:eb")
local uiGenText = getUI("ui:outgame:appear_name:eb"); local dbNameRace = getDbProp("UI:TEMP:NAME_RACE")
local dbNameSyllabe = getDbProp("UI:TEMP:NAME_SYLLABE"); local dbNameSubRaceFirstName = getDbProp("UI:TEMP:NAME_SUB_RACE_FIRST_NAME")
local dbNameRace = getDbProp("UI:TEMP:NAME_RACE"); local dbNameSubRaceLastName = getDbProp("UI:TEMP:NAME_SUB_RACE_LAST_NAME")
local dbNameSyllabeMax = getDbProp("UI:TEMP:NAME_SYLLABE_MAX");
local nameResult = ""; local nameResult = ""
local fullnameResult = ""; local fullnameResult = ""
local defResult = "";
-- Look at outgame:procUpdateNameRaceLabel() for the "race" list.
local nbRafsi = 0; -- fy ma try zo -->
for _ in pairs(rafsi) do nbRafsi = nbRafsi + 1 end local firstName = "test2"
local lastName = "test"
index = math.random(nbRafsi); -- Fyros and Matis are using "first name, last name" order
nameResult = rafsi[index]; -- Trykers and Zora<72>s are using "last name, first name" order
fullnameResult = gismu[index]; if tonumber(dbNameRace) == 1 then
defResult = def[index]; -- Fyros
firstName = self:getFyrosFirstName()
imax = tonumber(dbNameSyllabe); lastName = self:getFyrosLastName()
for i=2,imax,1 do fullnameResult = firstName .. " " .. lastName
index = math.random(nbRafsi); elseif tonumber(dbNameRace) == 2 then
nameResult = nameResult .. rafsi[index]; -- Matis
fullnameResult = fullnameResult .. " " .. gismu[index]; firstName = self:getMatisFirstName()
defResult = defResult .. " | " .. def[index]; lastName = self:getMatisLastName()
end fullnameResult = firstName .. " " .. lastName
elseif tonumber(dbNameRace) == 3 then
uiNameFull.hardtext = fullnameResult; -- Tryker
uiNameDef.hardtext = defResult; firstName = self:getTrykerFirstName()
lastName = self:getTrykerLastName()
nameResult = string.gsub(nameResult, "'", ""); fullnameResult = lastName .. " " .. firstName
nameResult = string.gsub(nameResult, " ", ""); elseif tonumber(dbNameRace) == 4 then
nameResult = string.gsub(nameResult, "-", ""); -- Zorai
nameResult = string.lower( nameResult ); firstName = self:getZoraiFirstName()
nameResult = nameResult:gsub("^%l", string.upper); lastName = self:getZoraiLastName()
uiGenText.input_string = nameResult; fullnameResult = lastName .. " " .. firstName
elseif tonumber(dbNameRace) == 5 then
-- Maraudeurs
-- firstName
if tonumber(dbNameSubRaceFirstName) == 1 then
-- Fyros
firstName = self:getFyrosFirstName()
elseif tonumber(dbNameSubRaceFirstName) == 2 then
-- Matis M
firstName = self:getMatisFirstName(1)
elseif tonumber(dbNameSubRaceFirstName) == 3 then
-- Matis F
firstName = self:getMatisFirstName(2)
elseif tonumber(dbNameSubRaceFirstName) == 4 then
-- Tryker
firstName = self:getTrykerFirstName()
elseif tonumber(dbNameSubRaceFirstName) == 5 then
-- Zorai
firstName = self:getZoraiFirstName()
end
-- lastName
if tonumber(dbNameSubRaceLastName) == 1 then
-- Fyros
lastName = self:getFyrosLastName()
elseif tonumber(dbNameSubRaceLastName) == 2 then
-- Matis
lastName = self:getMatisLastName()
elseif tonumber(dbNameSubRaceLastName) == 3 then
-- Tryker
lastName = self:getTrykerLastName()
elseif tonumber(dbNameSubRaceLastName) == 4 then
-- Zorai
lastName = self:getZoraiLastName()
end
fullnameResult = firstName .. " " .. lastName
end
-- always use first name for character name
nameResult = firstName
uiNameFull.hardtext = fullnameResult
nameResult = string.gsub(nameResult, "'", "")
nameResult = string.gsub(nameResult, " ", "")
nameResult = string.gsub(nameResult, "-", "")
nameResult = string.lower(nameResult)
nameResult = nameResult:gsub("^%l", string.upper)
uiGenText.input_string = nameResult
end end
-- Name syllabe slider update.
function outgame:procUpdateNameSyllabeLabel() -- Name sex slider update.
local uiNameSyllabeText_nb = getUI("ui:outgame:appear_name:name_syllabe_slider:name_syllabe_nb"); function outgame:procUpdateNameSexLabel()
local uiNameSyllabe = getDbProp("UI:TEMP:NAME_SYLLABE"); local nameSexType = { "uiCP_Sex_Male", "uiCP_Sex_Female" }
uiNameSyllabeText_nb.hardtext = uiNameSyllabe; local uiNameSexText = getUI("ui:outgame:appear_name:name_sex_slider:name_sex")
-- uiNameSyllabeText.hardtext = uiNameSyllabe .. " " .. i18n.get("uiCP_Syllabe"); local uiNameSex = getDbProp("UI:TEMP:NAME_SEX")
tempstr = tostring(i18n.get(nameSexType[tonumber(uiNameSex)]))
tempstr = string.lower(tempstr)
tempstr = (tempstr:gsub("^%l", string.upper))
uiNameSexText.hardtext = tempstr
end
-- Name race slider update.
function outgame:procUpdateNameRaceLabel()
local nameRaceType = { "Fyros", "Matis", "Tryker", "Zora<EFBFBD>", "uiCP_Maraudeur" }
local uiNameRaceText = getUI("ui:outgame:appear_name:name_race_slider:name_race")
local dbNameRace = getDbProp("UI:TEMP:NAME_RACE")
local uiNameSexSlider = getUI("ui:outgame:appear_name:name_sex_slider")
local uiNameSubRaceFirstNameSlider = getUI("ui:outgame:appear_name:name_sub_race_first_name_slider")
local uiNameSubRaceLastNameSlider = getUI("ui:outgame:appear_name:name_sub_race_last_name_slider")
local uiNameGenerate = getUI("ui:outgame:appear_name:generate")
-- Show/Hide sex slider
uiNameGenerate.y = "-50"
if tonumber(dbNameRace) == 2 then
uiNameSexSlider.active = true
uiNameGenerate.y = "-65"
else
uiNameSexSlider.active = false
end
-- Show/Hide sub race slider
if tonumber(dbNameRace) == 5 then
uiNameSubRaceFirstNameSlider.active = true
uiNameSubRaceLastNameSlider.active = true
uiNameGenerate.y = "-105"
else
uiNameSubRaceFirstNameSlider.active = false
uiNameSubRaceLastNameSlider.active = false
end
uiNameRaceText.hardtext = tostring(nameRaceType[tonumber(dbNameRace)])
end
local matisF = "Matis " .. (string.lower(tostring(i18n.get("uiCP_Sex_Female")) )):gsub("^%l", string.upper)
local matisM = "Matis " .. (string.lower(tostring(i18n.get("uiCP_Sex_Male")) )):gsub("^%l", string.upper)
function outgame:procUpdateNameSubRaceFirstNameLabel()
local nameSubRaceFirstNameType = { "Fyros", matisM, matisF, "Tryker", "Zora<EFBFBD>" }
local uiNameSubRaceFirstNameText = getUI("ui:outgame:appear_name:name_sub_race_first_name_slider:name_race")
local dbNameSubRaceFirstName = getDbProp("UI:TEMP:NAME_SUB_RACE_FIRST_NAME")
uiNameSubRaceFirstNameText.hardtext= tostring(nameSubRaceFirstNameType[tonumber(dbNameSubRaceFirstName)])
end
function outgame:procUpdateNameSubRaceLastNameLabel()
local nameSubRaceLastNameType = { "Fyros", "Matis", "Tryker", "Zora<EFBFBD>" }
local uiNameSubRaceLastNameText = getUI("ui:outgame:appear_name:name_sub_race_last_name_slider:name_race")
local dbNameSubRaceLastName = getDbProp("UI:TEMP:NAME_SUB_RACE_LAST_NAME")
uiNameSubRaceLastNameText.hardtext= tostring(nameSubRaceLastNameType[tonumber(dbNameSubRaceLastName)])
end end
------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------
-- called to construct icons -- called to construct icons
function outgame:activePackElement(id, icon) function outgame:activePackElement(id, icon)
local uiDesc = getUI("ui:outgame:appear:job_options:options:desc"); local uiDesc = getUI("ui:outgame:appear:job_options:options:desc")
uiDesc['ico' .. tostring(id)].active= true; uiDesc['ico' .. tostring(id)].active = true
uiDesc['ico' .. tostring(id)].texture= icon; uiDesc['ico' .. tostring(id)].texture = icon
uiDesc['ico' .. tostring(id) .. 'txt'].active= true; uiDesc['ico' .. tostring(id) .. 'txt'].active = true
end end
@ -73,13 +260,13 @@ end
-- called to construct pack text -- called to construct pack text
function outgame:setPackJobText(id, spec) function outgame:setPackJobText(id, spec)
-- Set Pack content -- Set Pack content
local uiPackText = getUI("ui:outgame:appear:job_options:options:desc:pack_" .. id); local uiPackText = getUI("ui:outgame:appear:job_options:options:desc:pack_" .. id)
uiPackText.hardtext= "uiCP_Job_" .. id .. tostring(spec); uiPackText.hardtext= "uiCP_Job_" .. id .. tostring(spec)
-- Set specialization text -- Set specialization text
local uiResText = getUI("ui:outgame:appear:job_options:options:result:res"); local uiResText = getUI("ui:outgame:appear:job_options:options:result:res")
if(spec==2) then if(spec==2) then
uiResText.hardtext= "uiCP_Res_" .. id; uiResText.hardtext= "uiCP_Res_" .. id
end end
end end
@ -87,65 +274,65 @@ end
-- called to construct pack -- called to construct pack
function outgame:buildActionPack() function outgame:buildActionPack()
local uiDesc = getUI("ui:outgame:appear:job_options:options:desc"); local uiDesc = getUI("ui:outgame:appear:job_options:options:desc")
if (uiDesc==nil) then if (uiDesc==nil) then
return; return
end end
-- Reset All -- Reset All
for i = 1,20 do for i = 1,20 do
uiDesc['ico' .. tostring(i)].active= false; uiDesc['ico' .. tostring(i)].active = false
uiDesc['ico' .. tostring(i) .. 'txt'].active= false; uiDesc['ico' .. tostring(i) .. 'txt'].active = false
end end
-- Build Default Combat -- Build Default Combat
self:activePackElement(1, 'f1.tga'); -- Dagger self:activePackElement(1, 'f1.tga') -- Dagger
self:activePackElement(2, 'f2.tga'); -- Accurate Attack self:activePackElement(2, 'f2.tga') -- Accurate Attack
-- Build Default Magic -- Build Default Magic
self:activePackElement(6, 'm2.tga'); -- Gloves self:activePackElement(6, 'm2.tga') -- Gloves
self:activePackElement(7, 'm1.tga'); -- Acid self:activePackElement(7, 'm1.tga') -- Acid
-- Build Default Forage -- Build Default Forage
self:activePackElement(11, 'g1.tga'); -- Forage Tool self:activePackElement(11, 'g1.tga') -- Forage Tool
self:activePackElement(12, 'g2.tga'); -- Basic Extract self:activePackElement(12, 'g2.tga') -- Basic Extract
-- Build Default Craft -- Build Default Craft
self:activePackElement(16, 'c2.tga'); -- Craft Tool self:activePackElement(16, 'c2.tga') -- Craft Tool
self:activePackElement(17, 'c1.tga'); -- 50 raw mat self:activePackElement(17, 'c1.tga') -- 50 raw mat
self:activePackElement(18, 'c3.tga'); -- Craft Root self:activePackElement(18, 'c3.tga') -- Craft Root
self:activePackElement(19, 'c4.tga'); -- Boots Plan self:activePackElement(19, 'c4.tga') -- Boots Plan
-- Build Option -- Build Option
if (getDbProp('UI:TEMP:JOB_FIGHT') == 2) then if (getDbProp('UI:TEMP:JOB_FIGHT') == 2) then
self:activePackElement(3, 'f3.tga'); -- Increase damage self:activePackElement(3, 'f3.tga') -- Increase damage
elseif (getDbProp('UI:TEMP:JOB_MAGIC') == 2) then elseif (getDbProp('UI:TEMP:JOB_MAGIC') == 2) then
self:activePackElement(8, 'm5.tga'); -- Fear self:activePackElement(8, 'm5.tga') -- Fear
elseif (getDbProp('UI:TEMP:JOB_FORAGE') == 2) then elseif (getDbProp('UI:TEMP:JOB_FORAGE') == 2) then
self:activePackElement(13, 'g3.tga'); -- Basic Prospection self:activePackElement(13, 'g3.tga') -- Basic Prospection
elseif (getDbProp('UI:TEMP:JOB_CRAFT') == 2) then elseif (getDbProp('UI:TEMP:JOB_CRAFT') == 2) then
self:activePackElement(20, 'c6.tga'); -- Gloves Plan self:activePackElement(20, 'c6.tga') -- Gloves Plan
self:activePackElement(17, 'c5.tga'); -- Replace 17, with 100x RawMat self:activePackElement(17, 'c5.tga') -- Replace 17, with 100x RawMat
end end
-- Reset Text -- Reset Text
self:setPackJobText('F', 1); self:setPackJobText('F', 1)
self:setPackJobText('M', 1); self:setPackJobText('M', 1)
self:setPackJobText('G', 1); self:setPackJobText('G', 1)
self:setPackJobText('C', 1); self:setPackJobText('C', 1)
-- Set correct text for specalized version -- Set correct text for specalized version
if (getDbProp('UI:TEMP:JOB_FIGHT') == 2) then if (getDbProp('UI:TEMP:JOB_FIGHT') == 2) then
self:setPackJobText('F', 2); self:setPackJobText('F', 2)
elseif (getDbProp('UI:TEMP:JOB_MAGIC') == 2) then elseif (getDbProp('UI:TEMP:JOB_MAGIC') == 2) then
self:setPackJobText('M', 2); self:setPackJobText('M', 2)
elseif (getDbProp('UI:TEMP:JOB_FORAGE') == 2) then elseif (getDbProp('UI:TEMP:JOB_FORAGE') == 2) then
self:setPackJobText('G', 2); self:setPackJobText('G', 2)
elseif (getDbProp('UI:TEMP:JOB_CRAFT') == 2) then elseif (getDbProp('UI:TEMP:JOB_CRAFT') == 2) then
self:setPackJobText('C', 2); self:setPackJobText('C', 2)
end end
end end
@ -186,8 +373,8 @@ end
--function outgame:setPatchProgress(progress) --function outgame:setPatchProgress(progress)
-- --debugInfo("*** 3 ***") -- --debugInfo("*** 3 ***")
-- local progressPercentText = string.format("%d%%", 100 * progress) -- local progressPercentText = string.format("%d%%", 100 * progress)
-- local progressPostfix = math.fmod(os.time(), 3) -- local progressPostfix = math.fmod(os.time(), 3)
-- --debugInfo("Patch in progress : " .. tostring(progress)) -- --debugInfo("Patch in progress : " .. tostring(progress))
-- local progressDate = nltime.getLocalTime() / 500 -- local progressDate = nltime.getLocalTime() / 500
-- local colValue = math.floor(230 + 24 * math.sin(progressDate)) -- local colValue = math.floor(230 + 24 * math.sin(progressDate))
-- local color = string.format("%d %d %d %d", colValue, colValue, colValue, 255) -- local color = string.format("%d %d %d %d", colValue, colValue, colValue, 255)
@ -203,7 +390,7 @@ end
-- --
--function outgame:setPatchError() --function outgame:setPatchError()
-- --debugInfo("*** 5 ***") -- --debugInfo("*** 5 ***")
-- --debugInfo("Patch error") -- --debugInfo("Patch error")
-- self:setProgressText(i18n.get("uiBGD_PatchError"), "255 0 0 255", 0) -- self:setProgressText(i18n.get("uiBGD_PatchError"), "255 0 0 255", 0)
--end --end
-- --
@ -219,9 +406,9 @@ end
function outgame:launchGame() function outgame:launchGame()
if not isPlayerSlotNewbieLand(getPlayerSelectedSlot()) then if not isPlayerSlotNewbieLand(getPlayerSelectedSlot()) then
if not isFullyPatched() then if not isFullyPatched() then
messageBoxWithHelp(i18n.get("uiBGD_MainlandCharFullPatchNeeded"), "ui:outgame") messageBoxWithHelp(i18n.get("uiBGD_MainlandCharFullPatchNeeded"), "ui:outgame")
return return
end end
end end
runAH(getUICaller(), "proc", "proc_charsel_play") runAH(getUICaller(), "proc", "proc_charsel_play")
end end

168
data/kh/kh_interfaces/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="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
data/kh/kh_interfaces/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="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>

2
data/kh/kh_interfaces/player_trade.xml
View file

@ -375,4 +375,4 @@
<tree node="accept_trade_invitation"> <tree node="accept_trade_invitation">
</tree> </tree>
</interface_config> </interface_config>

173
data/kh/kh_interfaces/widgets.xml
View file

@ -1819,6 +1819,14 @@
name="uimItemTextEdit" name="uimItemTextEdit"
handler="item_text_edition" handler="item_text_edition"
params="ui:interface:edit_custom" /> params="ui:interface:edit_custom" />
<action id="item_group"
name="uimGroup" />
<!-- Will be activated and populated in code -->
<group type="menu"
id="item_group_menu"
extends="base_menu">
</group>
</group> </group>
<!-- MAX_INVENTORY_ANIMAL --> <!-- MAX_INVENTORY_ANIMAL -->
<link expr="switch(@%pa_beast0:TYPE, 'uimMtPaMount0', 'uimMtPaMount0', 'uimMtPaPacker0', 'uimMtPaDemon0')" <link expr="switch(@%pa_beast0:TYPE, 'uimMtPaMount0', 'uimMtPaMount0', 'uimMtPaPacker0', 'uimMtPaDemon0')"
@ -2617,6 +2625,7 @@
<!-- * EDIT BOX WIDGET * --> <!-- * EDIT BOX WIDGET * -->
<!-- ********************* --> <!-- ********************* -->
<template name="edit_box_widget" <template name="edit_box_widget"
active="true"
posref="TL TL" posref="TL TL"
text_x="0" text_x="0"
text_y="0" text_y="0"
@ -2645,8 +2654,14 @@
keep="true" keep="true"
max_historic="40" max_historic="40"
fontsize="10" fontsize="10"
shadow="true"
shadow_x="1"
shadow_y="1"
shadow_color="0 0 0 255"
shadow_outline="false"
backup_father_container_pos="false" backup_father_container_pos="false"
want_return="false" want_return="false"
clear_on_escape="false"
color="255 255 255 255" color="255 255 255 255"
continuous_text_update="false" continuous_text_update="false"
bg_texture="W_box_blank.tga" bg_texture="W_box_blank.tga"
@ -2655,8 +2670,10 @@
max_float_prec="5" max_float_prec="5"
tooltip="" tooltip=""
tooltip_parent="" tooltip_parent=""
negative_filter=""> negative_filter=""
render_layer="0">
<group id="#id" <group id="#id"
active="#active"
posref="#posref" posref="#posref"
x="#x" x="#x"
y="#y" y="#y"
@ -2665,7 +2682,8 @@
child_resize_hmargin="#child_resize_hmargin" child_resize_hmargin="#child_resize_hmargin"
sizeref="#sizeref" sizeref="#sizeref"
w="#w" w="#w"
h="#h"> h="#h"
render_layer="#render_layer">
<group type="edit_box" <group type="edit_box"
sizeref="w" sizeref="w"
w="-8" w="-8"
@ -2687,13 +2705,15 @@
menu_r="#menu_r" menu_r="#menu_r"
max_historic="#max_historic" max_historic="#max_historic"
want_return="#want_return" want_return="#want_return"
clear_on_escape="#clear_on_escape"
backup_father_container_pos="#backup_father_container_pos" backup_father_container_pos="#backup_father_container_pos"
on_focus_lost="#on_focus_lost" on_focus_lost="#on_focus_lost"
on_focus_lost_params="#on_focus_lost_params" on_focus_lost_params="#on_focus_lost_params"
max_float_prec="#max_float_prec" max_float_prec="#max_float_prec"
tooltip="#tooltip" tooltip="#tooltip"
tooltip_parent="#tooltip_parent" tooltip_parent="#tooltip_parent"
negative_filter="#negative_filter"> negative_filter="#negative_filter"
render_layer="#render_layer">
<view type="bitmap" <view type="bitmap"
id="bg" id="bg"
scale="true" scale="true"
@ -2701,7 +2721,8 @@
h="0" h="0"
w="0" w="0"
texture="#bg_texture" texture="#bg_texture"
inherit_gc_alpha="true" /> inherit_gc_alpha="true"
render_layer="#render_layer" />
<view id="edit_text" <view id="edit_text"
type="text" type="text"
continuous_update="#continuous_text_update" continuous_update="#continuous_text_update"
@ -2712,9 +2733,14 @@
multi_line_space="0" multi_line_space="0"
fontsize="#fontsize" fontsize="#fontsize"
color="#color" color="#color"
shadow="true" shadow="#shadow"
shadow_x="#shadow_x"
shadow_y="#shadow_y"
shadow_color="#shadow_color"
shadow_outline="#shadow_outline"
hardtext="" hardtext=""
global_color="false" /> global_color="false"
render_layer="#render_layer" />
</group> </group>
<!-- border around the list --> <!-- border around the list -->
<view type="bitmap" <view type="bitmap"
@ -2722,25 +2748,29 @@
texture="W_box_top_left.tga" texture="W_box_top_left.tga"
posparent="eb" posparent="eb"
posref="TL BR" posref="TL BR"
inherit_gc_alpha="true" /> inherit_gc_alpha="true"
render_layer="#render_layer" />
<view type="bitmap" <view type="bitmap"
id="trb" id="trb"
texture="W_box_top_right.tga" texture="W_box_top_right.tga"
posparent="eb" posparent="eb"
posref="TR BL" posref="TR BL"
inherit_gc_alpha="true" /> inherit_gc_alpha="true"
render_layer="#render_layer" />
<view type="bitmap" <view type="bitmap"
id="brb" id="brb"
texture="W_box_bot_right.tga" texture="W_box_bot_right.tga"
posparent="eb" posparent="eb"
posref="BR TL" posref="BR TL"
inherit_gc_alpha="true" /> inherit_gc_alpha="true"
render_layer="#render_layer" />
<view type="bitmap" <view type="bitmap"
id="blb" id="blb"
texture="W_box_bot_left.tga" texture="W_box_bot_left.tga"
posparent="eb" posparent="eb"
posref="BL TR" posref="BL TR"
inherit_gc_alpha="true" /> inherit_gc_alpha="true"
render_layer="#render_layer" />
<view type="bitmap" <view type="bitmap"
id="tb" id="tb"
texture="W_box_top.tga" texture="W_box_top.tga"
@ -2750,7 +2780,8 @@
sizeref="w" sizeref="w"
w="0" w="0"
h="4" h="4"
inherit_gc_alpha="true" /> inherit_gc_alpha="true"
render_layer="#render_layer" />
<view type="bitmap" <view type="bitmap"
id="bb" id="bb"
texture="W_box_bot.tga" texture="W_box_bot.tga"
@ -2760,7 +2791,8 @@
sizeref="w" sizeref="w"
w="0" w="0"
h="4" h="4"
inherit_gc_alpha="true" /> inherit_gc_alpha="true"
render_layer="#render_layer" />
<view type="bitmap" <view type="bitmap"
id="lb" id="lb"
texture="W_box_left.tga" texture="W_box_left.tga"
@ -2770,7 +2802,8 @@
sizeref="h" sizeref="h"
h="0" h="0"
w="4" w="4"
inherit_gc_alpha="true" /> inherit_gc_alpha="true"
render_layer="#render_layer" />
<view type="bitmap" <view type="bitmap"
id="rb" id="rb"
texture="W_box_right.tga" texture="W_box_right.tga"
@ -2780,7 +2813,8 @@
sizeref="h" sizeref="h"
h="0" h="0"
w="4" w="4"
inherit_gc_alpha="true" /> inherit_gc_alpha="true"
render_layer="#render_layer" />
</group> </group>
</template> </template>
<!-- ******************************* --> <!-- ******************************* -->
@ -2816,6 +2850,11 @@
keep="true" keep="true"
max_historic="40" max_historic="40"
fontsize="10" fontsize="10"
shadow="true"
shadow_x="1"
shadow_y="1"
shadow_color="0 0 0 255"
shadow_outline="false"
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"
@ -2876,7 +2915,11 @@
multi_min_line="#multi_min_line" multi_min_line="#multi_min_line"
fontsize="#fontsize" fontsize="#fontsize"
color="#color" color="#color"
shadow="true" shadow="#shadow"
shadow_x="#shadow_x"
shadow_y="#shadow_y"
shadow_color="#shadow_color"
shadow_outline="#shadow_outline"
hardtext="" hardtext=""
global_color="false" global_color="false"
render_layer="#render_layer" /> render_layer="#render_layer" />
@ -6309,6 +6352,7 @@
x="0" x="0"
y="0" y="0"
posref="BL BL" posref="BL BL"
posparent=""
dblink="" dblink=""
texture="" texture=""
tooltip="" tooltip=""
@ -6317,6 +6361,7 @@
id="but_#id" id="but_#id"
button_type="toggle_button" button_type="toggle_button"
posref="#posref" posref="#posref"
posparent="but_#posparent"
x="#x" x="#x"
y="#y" y="#y"
tx_normal="w_button_filter_off.tga" tx_normal="w_button_filter_off.tga"
@ -6343,6 +6388,7 @@
x="0" x="0"
y="0" y="0"
posref="BL BL" posref="BL BL"
posparent=""
dblink="" dblink=""
texture="" texture=""
tooltip="" tooltip=""
@ -6351,6 +6397,7 @@
id="but_#id" id="but_#id"
button_type="toggle_button" button_type="toggle_button"
posref="#posref" posref="#posref"
posparent="but_#posparent"
x="#x" x="#x"
y="#y" y="#y"
tx_normal="w_button_filter_off.tga" tx_normal="w_button_filter_off.tga"
@ -6525,71 +6572,109 @@
texture="W_line_hor.tga" /> texture="W_line_hor.tga" />
<link expr="eq(@UI:SAVE:#inv_type:ICON_LIST, 0)" <link expr="eq(@UI:SAVE:#inv_type:ICON_LIST, 0)"
target="bag_list:active,sep2:active" /> target="bag_list:active,sep2:active" />
<!-- details -->
<instance template="tinv_item_list_icon_swap"
id="detail"
x="-2"
y="10"
posref="BR MR"
dblink="UI:SAVE:#inv_type:ICON_LIST"
texture="details_on.tga"
tooltip="uittDetail" />
<link expr="ifthenelse(@UI:SAVE:#inv_type:ICON_LIST, 'details_off.tga', 'details_on.tga')"
target="bit_detail:texture" />
<!-- filter -->
<instance template="tinv_item_list_filter" <instance template="tinv_item_list_filter"
id="filter_tp" id="filter_tp"
x="-35" x="-8"
y="1" posref="ML MR"
posref="BR BR" posparent="detail"
inv_type="#inv_type" inv_type="#inv_type"
dblink="UI:SAVE:#inv_type:FILTER_TP" dblink="UI:SAVE:#inv_type:FILTER_TP"
texture="filter_tp.tga" texture="filter_tp.tga"
tooltip="uittFilterTP" /> tooltip="uittFilterTP" />
<instance template="tinv_item_list_filter" <instance template="tinv_item_list_filter"
id="filter_missmp" id="filter_missmp"
x="-60" x="-2"
y="1" posref="ML MR"
posref="BR BR" posparent="filter_tp"
inv_type="#inv_type" inv_type="#inv_type"
dblink="UI:SAVE:#inv_type:FILTER_MISSMP" dblink="UI:SAVE:#inv_type:FILTER_MISSMP"
texture="filter_mission.tga" texture="filter_mission.tga"
tooltip="uittFilterMissMP" /> tooltip="uittFilterMissMP" />
<instance template="tinv_item_list_filter" <instance template="tinv_item_list_filter"
id="filter_mp" id="filter_mp"
x="-85" x="-2"
y="1" posref="ML MR"
posref="BR BR" posparent="filter_missmp"
inv_type="#inv_type" inv_type="#inv_type"
dblink="UI:SAVE:#inv_type:FILTER_MP" dblink="UI:SAVE:#inv_type:FILTER_MP"
texture="filter_mps.tga" texture="filter_mps.tga"
tooltip="uittFilterMP" /> tooltip="uittFilterMP" />
<instance template="tinv_item_list_filter" <instance template="tinv_item_list_filter"
id="filter_tool" id="filter_tool"
x="-110" x="-2"
y="1" posref="ML MR"
posref="BR BR" posparent="filter_mp"
inv_type="#inv_type" inv_type="#inv_type"
dblink="UI:SAVE:#inv_type:FILTER_TOOL" dblink="UI:SAVE:#inv_type:FILTER_TOOL"
texture="filter_tools.tga" texture="filter_tools.tga"
tooltip="uittFilterTool" /> tooltip="uittFilterTool" />
<instance template="tinv_item_list_filter" <instance template="tinv_item_list_filter"
id="filter_weapon" id="filter_weapon"
x="-135" x="-2"
y="1" posref="ML MR"
posref="BR BR" posparent="filter_tool"
inv_type="#inv_type" inv_type="#inv_type"
dblink="UI:SAVE:#inv_type:FILTER_WEAPON" dblink="UI:SAVE:#inv_type:FILTER_WEAPON"
texture="filter_weapon.tga" texture="filter_weapon.tga"
tooltip="uittFilterWeapon" /> tooltip="uittFilterWeapon" />
<instance template="tinv_item_list_filter" <instance template="tinv_item_list_filter"
id="filter_armor" id="filter_armor"
x="-160" x="-2"
y="1" posref="ML MR"
posref="BR BR" posparent="filter_weapon"
inv_type="#inv_type" inv_type="#inv_type"
dblink="UI:SAVE:#inv_type:FILTER_ARMOR" dblink="UI:SAVE:#inv_type:FILTER_ARMOR"
texture="filter_armor.tga" texture="filter_armor.tga"
tooltip="uittFilterArmor" /> tooltip="uittFilterArmor" />
<!-- details --> <!-- search -->
<instance template="tinv_item_list_icon_swap" <ctrl type="button"
id="detail" id="but_inv_search"
x="-4" button_type="toggle_button"
y="1" x="-2"
posref="BR BR" posref="ML MR"
dblink="UI:SAVE:#inv_type:ICON_LIST" posparent="but_filter_armor"
texture="details_on.tga" tx_normal="w_button_filter_off.tga"
tooltip="uittDetail" /> tx_pushed="w_button_filter_on.tga"
<link expr="ifthenelse(@UI:SAVE:#inv_type:ICON_LIST, 'details_off.tga', 'details_on.tga')" tx_over=""
target="bit_detail:texture" /> tooltip="uittInventorySearch"
onclick_l="inv_search_button"
params_l="inv_query_eb" />
<view type="bitmap"
id="bit_inv_search"
posref="MM MM"
posparent="but_inv_search"
texture="w_help_1.tga"
global_color="false"
color="255 255 255 150" />
<instance template="edit_box_widget"
id="inv_query_eb"
active="false"
posref="TR BR"
posparent="but_detail"
x="0"
y="8"
w="100"
render_layer="9"
clear_on_escape="true"
enter_recover_focus="false"
max_num_chars="20"
max_historic="0"
onenter="inv_set_search"
onchange="inv_set_search"
on_focus_lost="inv_search_unfocus"
on_focus_lost_params="but_inv_search" />
</group> </group>
</template> </template>
<!-- Link to trig brick action message. don't play when 0 (avoid flying text at startup) --> <!-- Link to trig brick action message. don't play when 0 (avoid flying text at startup) -->

78
data/ryz/ryz_zzz_bazaar/compass.xml
View file

@ -11,6 +11,15 @@
<variable entry="UI:SAVE:MP3_VOLUME" <variable entry="UI:SAVE:MP3_VOLUME"
type="sint64" type="sint64"
value="255" /> value="255" />
<variable entry="UI:SAVE:MP3_REPEAT"
type="sint32"
value="1" />
<variable entry="UI:SAVE:MP3_SHUFFLE"
type="sint32"
value="0" />
<variable entry="UI:TEMP:MP3_PLAYING"
type="sint32"
value="0" />
<!--******************--> <!--******************-->
<!--* MP3 PLAYER *--> <!--* MP3 PLAYER *-->
<!--******************--> <!--******************-->
@ -31,13 +40,30 @@
<ctrl type="button" id="btn" button_type="toggle_button" sizeref="wh" tx_normal="blank.tga" tx_pushed="blank.tga" tx_over="blank.tga" scale="true" <ctrl type="button" id="btn" button_type="toggle_button" sizeref="wh" tx_normal="blank.tga" tx_pushed="blank.tga" tx_over="blank.tga" scale="true"
color="255 255 255 0" col_pushed="255 255 255 0" col_over="255 255 255 90" color="255 255 255 0" col_pushed="255 255 255 0" col_over="255 255 255 90"
global_color_normal="true" global_color_pushed="true" global_color_over="true" global_color_normal="true" global_color_pushed="true" global_color_over="true"
ondblclick_l="music_player" params_dblclick_l="song=#index" /> ondblclick_l="music_player" params_dblclick_l="song=#index" />
<view type="bitmap" id="bg" posref="MM MM" sizeref="wh" color="200 200 200 50" texture="blank.tga" scale="true" active="false" />
<view type="text" id="title" posref="ML ML" x="0" line_maxw="#line_maxw" fontsize="8" shadow="true" multi_line="true" multi_line_space="0" /> <view type="text" id="title" posref="ML ML" x="0" line_maxw="#line_maxw" fontsize="8" shadow="true" multi_line="true" multi_line_space="0" />
<view type="text" id="duration" posref="MR MR" x="0" fontsize="8" shadow="true" color="255 255 255 128" /> <view type="text" id="duration" posref="MR MR" x="0" fontsize="8" shadow="true" color="255 255 255 150" />
</group> </group>
</template> </template>
<proc id="proc_mp3_toggle_shuffle">
<action handler="set" params="dblink=UI:SAVE:MP3_SHUFFLE|value=not(@UI:SAVE:MP3_SHUFFLE)" />
<action handler="music_player" params="update_playlist" />
</proc>
<proc id="proc_mp3_update_tooltip">
<action handler="lua" params="getUI('ui:interface:mp3_player:controls:but_play').tooltip = i18n.get('uiMP3Play')" cond="eq(@UI:TEMP:MP3_PLAYING,0)" />
<action handler="lua" params="getUI('ui:interface:mp3_player:controls:but_play').tooltip = i18n.get('uiMP3Pause')" cond="eq(@UI:TEMP:MP3_PLAYING,1)" />
</proc>
<proc id="proc_mp3_but_play">
<action handler="set" params="dblink=UI:TEMP:MP3_PLAYING|value=not(@UI:TEMP:MP3_PLAYING)" />
<action handler="music_player" params="play" cond="eq(@UI:TEMP:MP3_PLAYING,1)" />
<action handler="music_player" params="pause" cond="eq(@UI:TEMP:MP3_PLAYING,0)" />
</proc>
<group type="modal" <group type="modal"
id="playlist" id="playlist"
posparent="mp3_player" posparent="mp3_player"
@ -82,6 +108,30 @@
hardtext="uiPlaylistRefresh" hardtext="uiPlaylistRefresh"
onclick_l="music_player" onclick_l="music_player"
params_l="play_songs" /> params_l="play_songs" />
<ctrl style="text_button_header"
button_type="toggle_button"
id="shuffle"
posparent="refresh"
posref="ML MR"
x="-4"
y="0"
hardtext="S"
onclick_l="proc"
params_l="proc_mp3_toggle_shuffle" />
<ctrl style="text_button_header"
button_type="toggle_button"
id="repeat"
posparent="shuffle"
posref="ML MR"
x="-4"
y="0"
hardtext="R"
onclick_l="set"
params_l="dblink=UI:SAVE:MP3_REPEAT|value=not(@UI:SAVE:MP3_REPEAT)" />
<!-- change button state when variable chaanged -->
<link expr="@UI:SAVE:MP3_REPEAT" target="repeat:pushed" />
<link expr="@UI:SAVE:MP3_SHUFFLE" target="shuffle:pushed" />
<group id="content" x="8" y="-24" over="true" sizeref="w" posref="TL TL" child_resize_h="true" child_resize_hmargin="4"> <group id="content" x="8" y="-24" over="true" sizeref="w" posref="TL TL" child_resize_h="true" child_resize_hmargin="4">
<group id="songs" x="10" y="0" sizeref="w" posref="TL TL" child_resize_h="true" max_h="215"> <group id="songs" x="10" y="0" sizeref="w" posref="TL TL" child_resize_h="true" max_h="215">
@ -167,26 +217,30 @@
tooltip="uiMP3Prev" /> tooltip="uiMP3Prev" />
<ctrl type="button" <ctrl type="button"
id="but_play" id="but_play"
button_type="push_button" button_type="toggle_button"
posref="MM MM" posref="MM MM"
posparent="slot2" posparent="slot2"
tx_normal="mp3_button_play.tga" tx_normal="mp3_button_play.tga"
tx_pushed="mp3_button_play.tga" tx_pushed="mp3_button_pause.tga"
tx_over="mp3_button_over.tga" tx_over="mp3_button_over.tga"
onclick_l="music_player" onclick_l="proc"
params_l="play" params_l="proc_mp3_but_play"
tooltip="uiMP3Play" /> tooltip="uiMP3Play" />
<!-- TODO: but_stop is using placeholder texture -->
<ctrl type="button" <ctrl type="button"
id="but_pause" id="but_stop"
button_type="push_button" button_type="push_button"
posref="MM MM" posref="MM MM"
posparent="slot3" posparent="slot3"
tx_normal="mp3_button_pause.tga" tx_normal="w_button_10_choice.tga"
tx_pushed="mp3_button_pause.tga" tx_pushed="w_button_10_choice.tga"
tx_over="mp3_button_over.tga" tx_over="mp3_button_over.tga"
scale="true"
w="20"
h="16"
onclick_l="music_player" onclick_l="music_player"
params_l="pause" params_l="stop"
tooltip="uiMP3Pause" /> tooltip="uiMP3Stop" />
<ctrl type="button" <ctrl type="button"
id="but_next" id="but_next"
button_type="push_button" button_type="push_button"
@ -276,6 +330,8 @@
posref="TL TL" posref="TL TL"
w="48" w="48"
h="20" /> h="20" />
<link expr="@UI:TEMP:MP3_PLAYING" target="but_play:pushed" action="proc" params="proc_mp3_update_tooltip" />
</group> </group>
<!-- SCREEN --> <!-- SCREEN -->
<group id="screen" <group id="screen"

4
data/ryz/ryz_zzz_bazaar/game_context_menu.xml
View file

@ -97,7 +97,6 @@
<action id="pa_free" name="uimGcmFree" handler="beast_order" params="order=free|beast_index=@UI:GCM_BEAST_SELECTED"/> <action id="pa_free" name="uimGcmFree" handler="beast_order" params="order=free|beast_index=@UI:GCM_BEAST_SELECTED"/>
<action id="pa_enter_stable" name="uimGcmEnterStable" handler="beast_order" params="order=enter_stable|beast_index=@UI:GCM_BEAST_SELECTED"/> <action id="pa_enter_stable" name="uimGcmEnterStable" handler="beast_order" params="order=enter_stable|beast_index=@UI:GCM_BEAST_SELECTED"/>
<action id="extract_rm" name="uimGcmExtractRM" handler="context_extract_rm" params="" /> <action id="extract_rm" name="uimGcmExtractRM" handler="context_extract_rm" params="" />
<action id="quit_team" name="uimGcmQuitTeam" handler="context_quit_team" params="" />
<action id="info" name="uimGcmInfo" handler="open_title_help" params="from=target" /> <action id="info" name="uimGcmInfo" handler="open_title_help" params="from=target" />
<action id="build_totem" name="uimGcmChooseBuilding" handler="build_totem" params="" /> <action id="build_totem" name="uimGcmChooseBuilding" handler="build_totem" params="" />
@ -107,6 +106,9 @@
<action id="move" name="uimGcmMove" handler="context_move" params="" /> <action id="move" name="uimGcmMove" handler="context_move" params="" />
<action id="stop" name="uimGcmStopMove" handler="context_stop" params="" /> <action id="stop" name="uimGcmStopMove" handler="context_stop" params="" />
<action id="unseat" name="uimUnmount" handler="beast_order" params="order=unmount|beast_index=0" /> <action id="unseat" name="uimUnmount" handler="beast_order" params="order=unmount|beast_index=0" />
<separator/>
<action id="quit_team" name="uimGcmQuitTeam" handler="context_quit_team" params="" />
</group> </group>
<!-- TEMPORARY FOR TESTS --> <!-- TEMPORARY FOR TESTS -->

22
data/ryz/ryz_zzz_bazaar/interaction.lua
View file

@ -217,7 +217,7 @@ end
-- Is its level known (not too high ...) -- Is its level known (not too high ...)
-- Boss/Mini-bosses/Names colored ring -- Boss/Mini-bosses/Names colored ring
function game:updateTargetConsiderUI() function game:updateTargetConsiderUI()
--debugInfo("Updating consider widget") -- debugInfo("Updating consider widget")
local targetWindow = getUI("ui:interface:target") local targetWindow = getUI("ui:interface:target")
-- --
@ -228,12 +228,14 @@ function game:updateTargetConsiderUI()
local wgToolTip = targetWindow:find("target_tooltip") local wgToolTip = targetWindow:find("target_tooltip")
local wgPvPTag = targetWindow:find("pvp_tags") local wgPvPTag = targetWindow:find("pvp_tags")
local wgHeader = targetWindow:find("header_opened") local wgHeader = targetWindow:find("header_opened")
local wgLock = targetWindow:find("lock")
wgTargetSlotForce.active = true wgTargetSlotForce.active = true
wgImpossible.active = true wgImpossible.active = true
-- no selection ? -- no selection ?
if twGetTargetLevel() == -1 then if twGetTargetLevel() == -1 then
wgLock.active = false
wgTargetSlotForce.active = false wgTargetSlotForce.active = false
wgTargetLevel.active = false wgTargetLevel.active = false
wgImpossible.active = false wgImpossible.active = false
@ -254,20 +256,36 @@ function game:updateTargetConsiderUI()
wgPvPTag.active = false wgPvPTag.active = false
wgHeader.h = 34; wgHeader.h = 34;
-- /luaScript getUI("ui:interface:target:header_opened:lock").active=true
-- if the selection is a player, then both the local & targeted player must be in PVP mode for the level to be displayed -- if the selection is a player, then both the local & targeted player must be in PVP mode for the level to be displayed
if (twIsTargetPlayer()) then if (twIsTargetPlayer()) then
-- don't display anything ... -- don't display anything ...
wgLock.active = false
wgTargetSlotForce.active = false wgTargetSlotForce.active = false
wgTargetLevel.active = false wgTargetLevel.active = false
wgImpossible.active = false wgImpossible.active = false
wgSlotRing.active = false wgSlotRing.active = false
wgToolTip.tooltip = "" wgToolTip.tooltip = ""
if twIsTargetInPVPMode() then if twIsTargetInPVPMode() then
debugInfo("target in pvp")
wgPvPTag.active = true wgPvPTag.active = true
wgHeader.h = 56; wgHeader.h = 56;
end end
return return
else
wgLock.active = false
local level = getDbProp(getDefine("target_player_level"))
if level == 2 then -- Locked by team of player
wgLock.active = true
wgLock.color = "50 250 250 255"
else
if level == 1 then -- Locked by another team
wgLock.active = true
wgLock.color = "250 50 50 255"
end
end
end end
-- depending on the number of people in the group, set the max diff for visibility between player level -- depending on the number of people in the group, set the max diff for visibility between player level

2
data/ryz/ryz_zzz_bazaar/inventory.xml
View file

@ -549,7 +549,7 @@
pop_min_h="240" pop_min_h="240"
pop_max_w="920" pop_max_w="920"
pop_max_h="1600" pop_max_h="1600"
w="300" w="400"
h="400" h="400"
movable="true" movable="true"
active="false" active="false"

42
data/ryz/ryz_zzz_bazaar/map.lua Normal file
View file

@ -0,0 +1,42 @@
--
-- custom maps
--
if (game==nil) then
game= {};
end
-- alternative textures for maps
game.mapTextures = {}
-- game.mapTextures["zorai_map.tga"] = "tryker_map.tga"
-- register alternative texture for map
function game:setAltMap(mapName, altMap)
self.mapTextures[mapName] = altMap
end
-- remove alternative map texture
function game:removeAltMap(mapName)
self.mapTextures[mapName] = nil
end
-- map = getUI("ui:interface:map:content:map_content:actual_map")
function game:onLoadMap(map)
-- debugInfo("onLoadMap(id=".. map.id ..", texture=".. map.texture ..")");
-- if alt view not enabled
if getDbProp("UI:VARIABLES:SHOW_ALT_MAP") == 0 or map:isIsland() then
return
end
local texture = map.texture
if self.mapTextures[texture] ~= nil then
-- debugInfo("-- using ".. self.mapTextures[texture] .." for " .. texture)
return self.mapTextures[texture]
end
end
-- register map overrride
-- game:setAltMap("fyros_map.tga", "fyros_map_sp.tga")