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

Compare commits

base: Khaganat-NeL:merge_ryzomcore
Branches Tags
Khaganat-NeL:main
Khaganat-NeL:merge_ryzomcore
Khaganat-NeL:feature/21-Séparer-les-mains-des-barres-dactions
Khaganat-NeL:feature/0015_ajout_nouveau_objet
Khaganat-NeL:feature/20_modification_touches
..
compare: Khaganat-NeL:main
Branches Tags
Khaganat-NeL:merge_ryzomcore
Khaganat-NeL:main
Khaganat-NeL:feature/21-Séparer-les-mains-des-barres-dactions
Khaganat-NeL:feature/0015_ajout_nouveau_objet
Khaganat-NeL:feature/20_modification_touches

No commits in common. "merge_ryzomcore" and "main" have entirely different histories.
merge_ryzo ... main

21 changed files with 1292 additions and 1936 deletions
Show stats Expand all files Collapse all files

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

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

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

@ -529,8 +529,10 @@
posref="TL TL"
group_onclick_r="active_menu"
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" 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 id="content"
x="0"
@ -876,17 +878,10 @@
posparent="lum"
x="0"
y="-2" />
<instance template="tgcw_scrollbarfloat"
id="scale"
text="uiInterfaceScale"
posref="BL TL"
posparent="gam"
x="0"
y="-2" />
<instance template="tgcw_checkbox"
id="waitvbl"
text="uiWaitVBL"
posparent="scale"
posparent="gam"
posref="BL TL"
x="-20"
y="-28" />
@ -3098,13 +3093,6 @@
realtime="true"
widget="sbfloat"
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"
type="cfg"
realtime="true"

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

@ -906,6 +906,7 @@
group_params_r="menu=ui:interface:base_menu_with_color"
on_active="lua"
on_active_params="help:openCSBrowserHeader('cs_browser')">
</group>
<group id="content"
x="0"
@ -2829,7 +2830,7 @@
global_color_normal="true"
global_color_over="true"
global_color_pushed="true"
text_y="0"
text_y="-0"
fontsize="10"
shadow="true"
case_mode="%case_upper"

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

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

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

@ -1431,8 +1431,6 @@ function game:onInGameDbInitialized()
end
game:setInfoPlayerCharacterRace()
runAH(nil, "sort_tribefame", "")
end
function game:onWebIgReady()

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

@ -277,19 +277,6 @@
global_color="false"
render_layer="1"
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"
id="target_tooltip"
tooltip="uittConsiderTargetNoSelection"
@ -1042,9 +1029,7 @@
h="24"
posref="TL TL"
x="0"
y="-4"
max_w="0"
max_sizeref="w">
y="-4">
<ctrl style="tab_button_new"
id="tab0"
x="0"
@ -1185,22 +1170,6 @@
texture="blank.tga"
color="166 166 166 255" />
</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"
x="0"
y="0"
@ -3173,13 +3142,4 @@
params="game:chatUrlBrowse()" />
</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>

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

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

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

@ -27,6 +27,7 @@
<group id="checkpass" posref="MM MM" w="1024" h="768" active="false"
on_active="init_res_lod" on_deactive="uninit_res_lod" >
<group id="content" x="0" y="0" w="1024" h="768" posref="TL TL" >
<!-- BACKGROUND -->
@ -118,13 +119,13 @@
text_ref="BM BM" text_y="-2"
reset_focus_on_hide="false" max_historic="0"
onenter="set_keyboard_focus" params="target=ui:login:checkpass:content:submit_gr:eb_password:eb|select_all=false"
prompt="" enter_loose_focus="true" multi_line="false" max_num_chars="20" color="135 243 28 255" />
prompt="" enter_loose_focus="true" multi_line="false" max_num_chars="40" color="135 243 28 255" />
<instance template="edit_box_log" id="eb_password" posparent="txt_pas" posref="BL TL" w="240" h="24" fontsize="14" x="0" y="-4"
text_ref="BM BM" text_y="-2"
reset_focus_on_hide="false" max_historic="0" entry_type="password"
onenter="on_login" params=""
prompt="" enter_loose_focus="true" multi_line="false" max_num_chars="20" color="135 243 28 255" />
prompt="" enter_loose_focus="true" multi_line="false" max_num_chars="128" color="135 243 28 255" />
<ctrl style="log_std_but" id="but_log" posparent="eb_password" posref="TR TL" x="6" onclick_l="on_login" hardtext="uiOnConnect" />
@ -187,7 +188,7 @@
<instance template="server_box" id="res_win" posparent="web_win" posref="BL TL" w="276" h="24" y="-24" />
<instance template="server_box" id="lod_win" posparent="res_win" posref="TR TL" w="276" h="24" x="16" />
<!-- Textes -->
<!-- Textes -->
<view type="text" id="title_res" posparent="res_win" posref="TL BL" y="0" color="255 255 255 255" fontsize="10" shadow="true" hardtext="uiLOGResolution" />
<view type="text" id="title_lod" posparent="lod_win" posref="TL BL" y="0" color="255 255 255 255" fontsize="10" shadow="true" hardtext="uiLOGLod" />
@ -726,7 +727,7 @@ on_enter="leave_modal" options="no_bordure" mouse_pos="false" exit_key_pushed="t
text_ref="BM BM" text_y="-2"
on_focus="create_account_rules" on_focus_params="rules_login" reset_focus_on_hide="false" max_historic="0"
onenter="set_keyboard_focus" params="target=ui:login:create_account:content:submit_gr:eb_password:eb|select_all=false"
prompt="" enter_loose_focus="true" multi_line="false" max_num_chars="12" color="135 243 28 255" />
prompt="" enter_loose_focus="true" multi_line="false" max_num_chars="40" color="135 243 28 255" />
<!-- password -->
<view type="text" id="txt_pas" posparent="txt_log" posref="BL TL" hardtext="uiPassword" fontsize="12" x="0" y="-30" color="255 255 255 255" />
@ -735,7 +736,7 @@ on_enter="leave_modal" options="no_bordure" mouse_pos="false" exit_key_pushed="t
text_ref="BM BM" text_y="-2"
on_focus="create_account_rules" on_focus_params="rules_password" reset_focus_on_hide="false" max_historic="0" entry_type="password"
onenter="set_keyboard_focus" params="target=ui:login:create_account:content:submit_gr:eb_confirm_password:eb|select_all=false"
prompt="" enter_loose_focus="true" multi_line="false" max_num_chars="8" color="135 243 28 255" />
prompt="" enter_loose_focus="true" multi_line="false" max_num_chars="128" color="135 243 28 255" />
<!-- confirm password -->
<view type="text" id="txt_confirm_pas" posparent="txt_pas" posref="BL TL" hardtext="uiConfirmPassword" fontsize="12" x="0" y="-30" color="255 255 255 255" />
@ -744,7 +745,7 @@ on_enter="leave_modal" options="no_bordure" mouse_pos="false" exit_key_pushed="t
text_ref="BM BM" text_y="-2"
on_focus="create_account_rules" on_focus_params="rules_password_conf" reset_focus_on_hide="false" max_historic="0" entry_type="password"
onenter="set_keyboard_focus" params="target=ui:login:create_account:content:submit_gr:eb_email:eb|select_all=false"
prompt="" enter_loose_focus="true" multi_line="false" max_num_chars="8" color="135 243 28 255" />
prompt="" enter_loose_focus="true" multi_line="false" max_num_chars="128" color="135 243 28 255" />
<!-- email -->
<view type="text" id="txt_email" posparent="txt_confirm_pas" posref="BL TL" hardtext="uiEmail" fontsize="12" x="0" y="-30" color="255 255 255 255" />

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

@ -63,7 +63,7 @@
</template>
<template name="edit_box_log" posref="TL TL" text_x="0" text_y="0" text_ref="BL BL" multi_line="false" x="0" y="0" w="0" h="0"
<template name="edit_box_log" posref="TL TL" text_x="0" text_y="-1" text_ref="BL BL" multi_line="false" x="0" y="0" w="0" h="0"
id="eb" posparent="parent" onenter="chat_box_entry" params="" reset_focus_on_hide="true" on_focus="" on_focus_params=""
enter_loose_focus="true" prompt="&gt;"
enter_recover_focus="true"
@ -75,11 +75,6 @@
keep="true"
max_historic="0"
fontsize="10"
shadow="true"
shadow_x="1"
shadow_y="1"
shadow_color="0 0 0 255"
shadow_outline="false"
backup_father_container_pos="false"
want_return="false"
color="255 255 255 255"
@ -98,14 +93,14 @@
<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">
<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"/>
<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"/>
</group>
</group>
</template>
<template name="edit_box_widget_multiline" posref="TL TL" text_x="0" text_y="0" text_ref="BL BL" child_resize_h="true" multi_line="true" x="0" y="0" w="0" h="0"
<template name="edit_box_widget_multiline" posref="TL TL" text_x="0" text_y="-1" text_ref="BL BL" child_resize_h="true" multi_line="true" x="0" y="0" w="0" h="0"
sizeref="" id="eb" posparent="parent" onenter="chat_box_entry" params="" reset_focus_on_hide="true"
enter_loose_focus="true" prompt="&gt;"
enter_recover_focus="true"
@ -117,24 +112,16 @@
keep="true"
max_historic="40"
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"
want_return="false"
color="255 255 255 255"
sizeref_eb="w"
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 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 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"/>
<view id="edit_text" type="text" x="#text_x" y="#text_y" posref="#text_ref" multi_line="#multi_line" multi_line_space="0" fontsize="#fontsize" color="#color" shadow="true" hardtext="" global_color="false" render_layer="#render_layer"/>
</group>
<!-- border around the list -->
@ -151,7 +138,7 @@
<!-- Alternate look for multi line input -->
<template name="edit_box_widget_multiline_2" posref="TL TL" text_x="0" text_y="0" text_ref="BL BL" child_resize_h="true" multi_line="true" x="0" y="0" w="0" h="0"
<template name="edit_box_widget_multiline_2" posref="TL TL" text_x="0" text_y="-1" text_ref="BL BL" child_resize_h="true" multi_line="true" x="0" y="0" w="0" h="0"
sizeref="" id="eb" posparent="parent" onenter="chat_box_entry" params="" reset_focus_on_hide="true"
enter_loose_focus="true" prompt="&gt;"
enter_recover_focus="true"
@ -163,11 +150,6 @@
keep="true"
max_historic="40"
fontsize="10"
shadow="true"
shadow_x="1"
shadow_y="1"
shadow_color="0 0 0 255"
shadow_outline="false"
backup_father_container_pos="false"
want_return="false"
color="255 255 255 255"
@ -177,7 +159,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 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 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"/>
<view id="edit_text" type="text" x="#text_x" y="#text_y" posref="#text_ref" multi_line="#multi_line" multi_line_space="0" fontsize="#fontsize" color="#color" shadow="true" hardtext="" global_color="false" render_layer="#render_layer"/>
</group>
<!-- border around the list -->
@ -197,7 +179,7 @@
<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"
color="255 255 255 255" col_over="255 255 255 255" col_pushed="255 255 255 255"
text_y="0" fontsize="10" shadow="true"
text_y="-3" fontsize="10" shadow="true"
text_color_normal="255 255 255 160"
text_color_pushed="255 255 255 255"
text_color_over="255 255 255 255"
@ -210,10 +192,10 @@
<style style="log_std_but" type="text_button" button_type="push_button"
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"
text_y="-1" fontsize="10" shadow="true"
text_color_normal="135 243 28 160"
text_color_pushed="135 243 28 255"
text_color_over="135 243 28 255"
text_y="-3" fontsize="10" shadow="true"
text_color_normal="255 254 243 160"
text_color_pushed="255 254 243 255"
text_color_over="255 254 243 255"
text_shadow_color_normal="0 0 0 255"
text_shadow_color_pushed="0 0 0 255"
text_shadow_color_over="0 0 0 255"
@ -223,9 +205,9 @@
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"
text_y="-3" fontsize="10" shadow="true"
text_color_normal="135 243 28 160"
text_color_pushed="135 243 28 255"
text_color_over="135 243 28 255"
text_color_normal="255 254 243 160"
text_color_pushed="255 254 243 255"
text_color_over="255 254 243 255"
text_shadow_color_normal="0 0 0 255"
text_shadow_color_pushed="0 0 0 255"
text_shadow_color_over="0 0 0 255"
@ -236,9 +218,9 @@
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"
text_y="-3" fontsize="10" shadow="true"
text_color_normal="135 243 28 160"
text_color_pushed="135 243 28 255"
text_color_over="135 243 28 255"
text_color_normal="255 254 243 160"
text_color_pushed="255 254 243 255"
text_color_over="255 254 243 255"
text_shadow_color_normal="0 0 0 255"
text_shadow_color_pushed="0 0 0 255"
text_shadow_color_over="0 0 0 255"
@ -247,7 +229,7 @@
<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"
global_color_normal="true" global_color_over="true" global_color_pushed="true"
text_y="0" fontsize="10" shadow="true" case_mode="%case_upper" wmargin="8"
text_y="-2" fontsize="10" shadow="true" case_mode="%case_upper" wmargin="8"
text_color_normal="255 255 255 128" text_color_pushed="255 255 255 255" text_color_over="255 255 255 255" />
@ -259,7 +241,7 @@
<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"
color="135 243 28 255" fontsize="12" shadow="true" multi_line="true" multi_line_space="0" case_mode="%case_first_sentence_letter_up"/>
color="255 254 243 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"/>
@ -294,7 +276,7 @@
<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"
color="135 243 28 255" fontsize="12" shadow="true" multi_line="true" multi_line_space="0" case_mode="%case_first_sentence_letter_up"/>
color="255 254 243 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_help" posparent="text" posref="BM TR" x="-2" y="-6" onclick_l="proc" params_l="proc_browse_faq" hardtext="uittBrowseFaq"/>
@ -400,7 +382,7 @@
<!-- * EDIT BOX WIDGET * -->
<!-- ********************* -->
<template name="edit_box_widget" posref="TL TL" text_x="0" text_y="0" text_ref="BL BL" child_resize_h="true" multi_line="false" x="0" y="0" w="0" h="0"
<template name="edit_box_widget" posref="TL TL" text_x="0" text_y="-1" text_ref="BL BL" child_resize_h="true" multi_line="false" x="0" y="0" w="0" h="0"
sizeref="" id="eb" posparent="parent" onenter="chat_box_entry" params="" reset_focus_on_hide="true"
enter_loose_focus="true" prompt="&gt;"
enter_recover_focus="true"
@ -412,11 +394,6 @@
keep="true"
max_historic="40"
fontsize="10"
shadow="true"
shadow_x="1"
shadow_y="1"
shadow_color="0 0 0 255"
shadow_outline="false"
backup_father_container_pos="false"
want_return="false"
color="255 255 255 255"
@ -427,7 +404,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">
<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="#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"/>
<view id="edit_text" type="text" x="#text_x" y="#text_y" posref="#text_ref" multi_line="#multi_line" multi_line_space="0" fontsize="#fontsize" color="#color" shadow="true" hardtext="" global_color="false" render_layer="#render_layer"/>
</group>
<!-- border around the list -->
@ -443,7 +420,7 @@
</template>
<!-- alternate look for edit box -->
<template name="edit_box_widget_2" posref="TL TL" text_x="0" text_y="0" text_ref="BL BL" child_resize_h="true" multi_line="false" x="0" y="0" w="0" h="0"
<template name="edit_box_widget_2" posref="TL TL" text_x="0" text_y="-1" text_ref="BL BL" child_resize_h="true" multi_line="false" x="0" y="0" w="0" h="0"
sizeref="" id="eb" posparent="parent" onenter="chat_box_entry" params="" reset_focus_on_hide="true"
enter_loose_focus="true" prompt="&gt;"
enter_recover_focus="true"
@ -455,11 +432,6 @@
keep="true"
max_historic="40"
fontsize="10"
shadow="true"
shadow_x="1"
shadow_y="1"
shadow_color="0 0 0 255"
shadow_outline="false"
backup_father_container_pos="false"
want_return="false"
color="255 255 255 255"
@ -469,7 +441,7 @@
<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="#shadow" shadow_x="#shadow_x" shadow_y="#shadow_y" shadow_color="#shadow_color" shadow_outline="#shadow_outline" 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="true" hardtext="" global_color="false"/>
</group>
<!-- border around the list -->
@ -623,8 +595,8 @@
<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" >
<group id="#id" posparent="#posparent" posref="#posref" child_resize_w="true" child_resize_h="true" x="#x" y="#y">
<ctrl style="button_ok" x="0" y="0" posref="TL TL" text_y="0" onclick_l="#onclick_ok" params_l="#onclick_ok_param" hardtext="#ok_text" />
<ctrl style="button_cancel" x="4" posparent="ok" text_y="0" posref ="TR TL" onclick_l="#onclick_cancel" params_l="#onclick_cancel_param" hardtext="#cancel_text" />
<ctrl style="button_ok" x="0" y="0" posref="TL TL" text_y="-2" onclick_l="#onclick_ok" params_l="#onclick_ok_param" hardtext="#ok_text" />
<ctrl style="button_cancel" x="4" posparent="ok" text_y="-2" posref ="TR TL" onclick_l="#onclick_cancel" params_l="#onclick_cancel_param" hardtext="#cancel_text" />
</group>
</template>
@ -639,7 +611,7 @@
<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">
<group type="html_input_offset" y_offset="-8" id="#id" posparent="#posparent" posref="#posref" child_resize_w="true" child_resize_h="true" x="#x" y="#y" active="#active">
<ctrl style="log_spe_but" id="button" wmin="#wmin" x="0" y="0" posref="TL TL" text_y="0" onclick_l="#onclick" params_l="#onclick_param" hardtext="#text" color="255 255 255 200"/>
<ctrl style="log_spe_but" id="button" wmin="#wmin" x="0" y="0" posref="TL TL" text_y="-2" onclick_l="#onclick" params_l="#onclick_param" hardtext="#text" color="255 255 255 200"/>
</group>
</template>
@ -648,7 +620,7 @@
<template name="html_text_button_look2" id="" text="" posparent="parent" posref="TL TL"
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">
<ctrl style="log_button" id="button" wmin="0" x="0" y="0" posref="TL TL" text_y="0" onclick_l="#onclick" params_l="#onclick_param" hardtext="#text" color="255 255 255 200"/>
<ctrl style="log_button" id="button" wmin="0" x="0" y="0" posref="TL TL" text_y="-2" onclick_l="#onclick" params_l="#onclick_param" hardtext="#text" color="255 255 255 200"/>
</group>
</template>
@ -657,7 +629,7 @@
<template name="html_text_button_look3" id="" text="" posparent="parent" posref="TL TL"
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">
<ctrl style="server_note" id="button" wmin="0" x="0" y="0" posref="TL TL" text_y="0" onclick_l="#onclick" params_l="#onclick_param" hardtext="#text" color="255 255 255 200"/>
<ctrl style="server_note" id="button" wmin="0" x="0" y="0" posref="TL TL" text_y="-2" onclick_l="#onclick" params_l="#onclick_param" hardtext="#text" color="255 255 255 200"/>
</group>
</template>
@ -854,7 +826,7 @@
>
<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="135 243 28 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="255 254 243 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"
@ -983,46 +955,6 @@
highlight_over="255 255 255 128"
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>

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

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

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

@ -2,10 +2,6 @@
<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 -->
<group type="menu" id="land_mark_menu" extends="base_menu">
@ -29,8 +25,6 @@
<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=""/>
<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"/>
</group>
@ -150,7 +144,6 @@
<!-- * USER MAP * -->
<!-- ******************************************************************** -->
<variable entry="UI:VARIABLES:ISACTIVE:MAP_SEARCH" type="sint32" value="0" />
<proc id="map_proc_active">
<action handler="set" params="dblink=UI:VARIABLES:ISACTIVE:MAP|value=1" />
@ -162,77 +155,10 @@
<action handler="lua" params="if (r2 and r2.Mode == 'Edit') then r2.ToolUI:updateToggleWindowButtons() end" />
</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" />
<!-- 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"
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"
@ -265,10 +191,8 @@
<!-- 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"
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="lm_search_btn" posref="MR ML" color="255 255 255 255" fontsize="12" shadow="true" hardtext="" />
<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="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" />
@ -391,53 +315,11 @@
selection_axis_color = "0 0 0 127"
compass="ui:interface:compass"
scale_max="2"
scale_max_r2="8"
/>
<!-- 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>
@ -526,6 +408,7 @@
player_pos_tex="player_pos.tga"
scale_max="2"
/>
<!-- border around the map -->

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

@ -3,256 +3,69 @@
------------------------------------------------------------------------------------------------------------
-- create the game namespace without reseting if already created in an other file.
if (outgame == nil) then
outgame = {}
if (outgame==nil) then
outgame= {};
end
------------------------------------------------------------------------------------------------------------
-- 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()
local uiNameFull = getUI("ui:outgame:appear_name:name_full")
local uiGenText = getUI("ui:outgame:appear_name:eb")
local dbNameRace = getDbProp("UI:TEMP:NAME_RACE")
local dbNameSubRaceFirstName = getDbProp("UI:TEMP:NAME_SUB_RACE_FIRST_NAME")
local dbNameSubRaceLastName = getDbProp("UI:TEMP:NAME_SUB_RACE_LAST_NAME")
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 dbNameSyllabe = getDbProp("UI:TEMP:NAME_SYLLABE");
local dbNameRace = getDbProp("UI:TEMP:NAME_RACE");
local dbNameSyllabeMax = getDbProp("UI:TEMP:NAME_SYLLABE_MAX");
local nameResult = ""
local fullnameResult = ""
local nameResult = "";
local fullnameResult = "";
local defResult = "";
-- Look at outgame:procUpdateNameRaceLabel() for the "race" list.
-- fy ma try zo -->
local firstName = "test2"
local lastName = "test"
local nbRafsi = 0;
for _ in pairs(rafsi) do nbRafsi = nbRafsi + 1 end
-- Fyros and Matis are using "first name, last name" order
-- Trykers and Zora<72>s are using "last name, first name" order
if tonumber(dbNameRace) == 1 then
-- Fyros
firstName = self:getFyrosFirstName()
lastName = self:getFyrosLastName()
fullnameResult = firstName .. " " .. lastName
elseif tonumber(dbNameRace) == 2 then
-- Matis
firstName = self:getMatisFirstName()
lastName = self:getMatisLastName()
fullnameResult = firstName .. " " .. lastName
elseif tonumber(dbNameRace) == 3 then
-- Tryker
firstName = self:getTrykerFirstName()
lastName = self:getTrykerLastName()
fullnameResult = lastName .. " " .. firstName
elseif tonumber(dbNameRace) == 4 then
-- Zorai
firstName = self:getZoraiFirstName()
lastName = self:getZoraiLastName()
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
index = math.random(nbRafsi);
nameResult = rafsi[index];
fullnameResult = gismu[index];
defResult = def[index];
-- 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
imax = tonumber(dbNameSyllabe);
for i=2,imax,1 do
index = math.random(nbRafsi);
nameResult = nameResult .. rafsi[index];
fullnameResult = fullnameResult .. " " .. gismu[index];
defResult = defResult .. " | " .. def[index];
end
fullnameResult = firstName .. " " .. lastName
end
uiNameFull.hardtext = fullnameResult;
uiNameDef.hardtext = defResult;
-- always use first name for character name
nameResult = firstName
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;
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
-- Name sex slider update.
function outgame:procUpdateNameSexLabel()
local nameSexType = { "uiCP_Sex_Male", "uiCP_Sex_Female" }
local uiNameSexText = getUI("ui:outgame:appear_name:name_sex_slider:name_sex")
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)])
-- Name syllabe slider update.
function outgame:procUpdateNameSyllabeLabel()
local uiNameSyllabeText_nb = getUI("ui:outgame:appear_name:name_syllabe_slider:name_syllabe_nb");
local uiNameSyllabe = getDbProp("UI:TEMP:NAME_SYLLABE");
uiNameSyllabeText_nb.hardtext = uiNameSyllabe;
-- uiNameSyllabeText.hardtext = uiNameSyllabe .. " " .. i18n.get("uiCP_Syllabe");
end
------------------------------------------------------------------------------------------------------------
-- called to construct icons
function outgame:activePackElement(id, icon)
local uiDesc = getUI("ui:outgame:appear:job_options:options:desc")
uiDesc['ico' .. tostring(id)].active = true
uiDesc['ico' .. tostring(id)].texture = icon
uiDesc['ico' .. tostring(id) .. 'txt'].active = true
local uiDesc = getUI("ui:outgame:appear:job_options:options:desc");
uiDesc['ico' .. tostring(id)].active= true;
uiDesc['ico' .. tostring(id)].texture= icon;
uiDesc['ico' .. tostring(id) .. 'txt'].active= true;
end
@ -260,13 +73,13 @@ end
-- called to construct pack text
function outgame:setPackJobText(id, spec)
-- Set Pack content
local uiPackText = getUI("ui:outgame:appear:job_options:options:desc:pack_" .. id)
uiPackText.hardtext= "uiCP_Job_" .. id .. tostring(spec)
local uiPackText = getUI("ui:outgame:appear:job_options:options:desc:pack_" .. id);
uiPackText.hardtext= "uiCP_Job_" .. id .. tostring(spec);
-- 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
uiResText.hardtext= "uiCP_Res_" .. id
uiResText.hardtext= "uiCP_Res_" .. id;
end
end
@ -274,63 +87,63 @@ end
-- called to construct pack
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
return
return;
end
-- Reset All
for i = 1,20 do
uiDesc['ico' .. tostring(i)].active = false
uiDesc['ico' .. tostring(i) .. 'txt'].active = false
uiDesc['ico' .. tostring(i)].active= false;
uiDesc['ico' .. tostring(i) .. 'txt'].active= false;
end
-- Build Default Combat
self:activePackElement(1, 'f1.tga') -- Dagger
self:activePackElement(2, 'f2.tga') -- Accurate Attack
self:activePackElement(1, 'f1.tga'); -- Dagger
self:activePackElement(2, 'f2.tga'); -- Accurate Attack
-- Build Default Magic
self:activePackElement(6, 'm2.tga') -- Gloves
self:activePackElement(7, 'm1.tga') -- Acid
self:activePackElement(6, 'm2.tga'); -- Gloves
self:activePackElement(7, 'm1.tga'); -- Acid
-- Build Default Forage
self:activePackElement(11, 'g1.tga') -- Forage Tool
self:activePackElement(12, 'g2.tga') -- Basic Extract
self:activePackElement(11, 'g1.tga'); -- Forage Tool
self:activePackElement(12, 'g2.tga'); -- Basic Extract
-- Build Default Craft
self:activePackElement(16, 'c2.tga') -- Craft Tool
self:activePackElement(17, 'c1.tga') -- 50 raw mat
self:activePackElement(18, 'c3.tga') -- Craft Root
self:activePackElement(19, 'c4.tga') -- Boots Plan
self:activePackElement(16, 'c2.tga'); -- Craft Tool
self:activePackElement(17, 'c1.tga'); -- 50 raw mat
self:activePackElement(18, 'c3.tga'); -- Craft Root
self:activePackElement(19, 'c4.tga'); -- Boots Plan
-- Build Option
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
self:activePackElement(8, 'm5.tga') -- Fear
self:activePackElement(8, 'm5.tga'); -- Fear
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
self:activePackElement(20, 'c6.tga') -- Gloves Plan
self:activePackElement(17, 'c5.tga') -- Replace 17, with 100x RawMat
self:activePackElement(20, 'c6.tga'); -- Gloves Plan
self:activePackElement(17, 'c5.tga'); -- Replace 17, with 100x RawMat
end
-- Reset Text
self:setPackJobText('F', 1)
self:setPackJobText('M', 1)
self:setPackJobText('G', 1)
self:setPackJobText('C', 1)
self:setPackJobText('F', 1);
self:setPackJobText('M', 1);
self:setPackJobText('G', 1);
self:setPackJobText('C', 1);
-- Set correct text for specalized version
if (getDbProp('UI:TEMP:JOB_FIGHT') == 2) then
self:setPackJobText('F', 2)
self:setPackJobText('F', 2);
elseif (getDbProp('UI:TEMP:JOB_MAGIC') == 2) then
self:setPackJobText('M', 2)
self:setPackJobText('M', 2);
elseif (getDbProp('UI:TEMP:JOB_FORAGE') == 2) then
self:setPackJobText('G', 2)
self:setPackJobText('G', 2);
elseif (getDbProp('UI:TEMP:JOB_CRAFT') == 2) then
self:setPackJobText('C', 2)
self:setPackJobText('C', 2);
end
end

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

@ -1819,14 +1819,6 @@
name="uimItemTextEdit"
handler="item_text_edition"
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>
<!-- MAX_INVENTORY_ANIMAL -->
<link expr="switch(@%pa_beast0:TYPE, 'uimMtPaMount0', 'uimMtPaMount0', 'uimMtPaPacker0', 'uimMtPaDemon0')"
@ -2625,7 +2617,6 @@
<!-- * EDIT BOX WIDGET * -->
<!-- ********************* -->
<template name="edit_box_widget"
active="true"
posref="TL TL"
text_x="0"
text_y="0"
@ -2654,14 +2645,8 @@
keep="true"
max_historic="40"
fontsize="10"
shadow="true"
shadow_x="1"
shadow_y="1"
shadow_color="0 0 0 255"
shadow_outline="false"
backup_father_container_pos="false"
want_return="false"
clear_on_escape="false"
color="255 255 255 255"
continuous_text_update="false"
bg_texture="W_box_blank.tga"
@ -2670,10 +2655,8 @@
max_float_prec="5"
tooltip=""
tooltip_parent=""
negative_filter=""
render_layer="0">
negative_filter="">
<group id="#id"
active="#active"
posref="#posref"
x="#x"
y="#y"
@ -2682,8 +2665,7 @@
child_resize_hmargin="#child_resize_hmargin"
sizeref="#sizeref"
w="#w"
h="#h"
render_layer="#render_layer">
h="#h">
<group type="edit_box"
sizeref="w"
w="-8"
@ -2705,15 +2687,13 @@
menu_r="#menu_r"
max_historic="#max_historic"
want_return="#want_return"
clear_on_escape="#clear_on_escape"
backup_father_container_pos="#backup_father_container_pos"
on_focus_lost="#on_focus_lost"
on_focus_lost_params="#on_focus_lost_params"
max_float_prec="#max_float_prec"
tooltip="#tooltip"
tooltip_parent="#tooltip_parent"
negative_filter="#negative_filter"
render_layer="#render_layer">
negative_filter="#negative_filter">
<view type="bitmap"
id="bg"
scale="true"
@ -2721,8 +2701,7 @@
h="0"
w="0"
texture="#bg_texture"
inherit_gc_alpha="true"
render_layer="#render_layer" />
inherit_gc_alpha="true" />
<view id="edit_text"
type="text"
continuous_update="#continuous_text_update"
@ -2733,14 +2712,9 @@
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"
shadow="true"
hardtext=""
global_color="false"
render_layer="#render_layer" />
global_color="false" />
</group>
<!-- border around the list -->
<view type="bitmap"
@ -2748,29 +2722,25 @@
texture="W_box_top_left.tga"
posparent="eb"
posref="TL BR"
inherit_gc_alpha="true"
render_layer="#render_layer" />
inherit_gc_alpha="true" />
<view type="bitmap"
id="trb"
texture="W_box_top_right.tga"
posparent="eb"
posref="TR BL"
inherit_gc_alpha="true"
render_layer="#render_layer" />
inherit_gc_alpha="true" />
<view type="bitmap"
id="brb"
texture="W_box_bot_right.tga"
posparent="eb"
posref="BR TL"
inherit_gc_alpha="true"
render_layer="#render_layer" />
inherit_gc_alpha="true" />
<view type="bitmap"
id="blb"
texture="W_box_bot_left.tga"
posparent="eb"
posref="BL TR"
inherit_gc_alpha="true"
render_layer="#render_layer" />
inherit_gc_alpha="true" />
<view type="bitmap"
id="tb"
texture="W_box_top.tga"
@ -2780,8 +2750,7 @@
sizeref="w"
w="0"
h="4"
inherit_gc_alpha="true"
render_layer="#render_layer" />
inherit_gc_alpha="true" />
<view type="bitmap"
id="bb"
texture="W_box_bot.tga"
@ -2791,8 +2760,7 @@
sizeref="w"
w="0"
h="4"
inherit_gc_alpha="true"
render_layer="#render_layer" />
inherit_gc_alpha="true" />
<view type="bitmap"
id="lb"
texture="W_box_left.tga"
@ -2802,8 +2770,7 @@
sizeref="h"
h="0"
w="4"
inherit_gc_alpha="true"
render_layer="#render_layer" />
inherit_gc_alpha="true" />
<view type="bitmap"
id="rb"
texture="W_box_right.tga"
@ -2813,8 +2780,7 @@
sizeref="h"
h="0"
w="4"
inherit_gc_alpha="true"
render_layer="#render_layer" />
inherit_gc_alpha="true" />
</group>
</template>
<!-- ******************************* -->
@ -2850,11 +2816,6 @@
keep="true"
max_historic="40"
fontsize="10"
shadow="true"
shadow_x="1"
shadow_y="1"
shadow_color="0 0 0 255"
shadow_outline="false"
backup_father_container_pos="false"
want_return="false"
color="255 255 255 255"
@ -2915,11 +2876,7 @@
multi_min_line="#multi_min_line"
fontsize="#fontsize"
color="#color"
shadow="#shadow"
shadow_x="#shadow_x"
shadow_y="#shadow_y"
shadow_color="#shadow_color"
shadow_outline="#shadow_outline"
shadow="true"
hardtext=""
global_color="false"
render_layer="#render_layer" />
@ -6352,7 +6309,6 @@
x="0"
y="0"
posref="BL BL"
posparent=""
dblink=""
texture=""
tooltip=""
@ -6361,7 +6317,6 @@
id="but_#id"
button_type="toggle_button"
posref="#posref"
posparent="but_#posparent"
x="#x"
y="#y"
tx_normal="w_button_filter_off.tga"
@ -6388,7 +6343,6 @@
x="0"
y="0"
posref="BL BL"
posparent=""
dblink=""
texture=""
tooltip=""
@ -6397,7 +6351,6 @@
id="but_#id"
button_type="toggle_button"
posref="#posref"
posparent="but_#posparent"
x="#x"
y="#y"
tx_normal="w_button_filter_off.tga"
@ -6572,109 +6525,71 @@
texture="W_line_hor.tga" />
<link expr="eq(@UI:SAVE:#inv_type:ICON_LIST, 0)"
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"
id="filter_tp"
x="-8"
posref="ML MR"
posparent="detail"
x="-35"
y="1"
posref="BR BR"
inv_type="#inv_type"
dblink="UI:SAVE:#inv_type:FILTER_TP"
texture="filter_tp.tga"
tooltip="uittFilterTP" />
<instance template="tinv_item_list_filter"
id="filter_missmp"
x="-2"
posref="ML MR"
posparent="filter_tp"
x="-60"
y="1"
posref="BR BR"
inv_type="#inv_type"
dblink="UI:SAVE:#inv_type:FILTER_MISSMP"
texture="filter_mission.tga"
tooltip="uittFilterMissMP" />
<instance template="tinv_item_list_filter"
id="filter_mp"
x="-2"
posref="ML MR"
posparent="filter_missmp"
x="-85"
y="1"
posref="BR BR"
inv_type="#inv_type"
dblink="UI:SAVE:#inv_type:FILTER_MP"
texture="filter_mps.tga"
tooltip="uittFilterMP" />
<instance template="tinv_item_list_filter"
id="filter_tool"
x="-2"
posref="ML MR"
posparent="filter_mp"
x="-110"
y="1"
posref="BR BR"
inv_type="#inv_type"
dblink="UI:SAVE:#inv_type:FILTER_TOOL"
texture="filter_tools.tga"
tooltip="uittFilterTool" />
<instance template="tinv_item_list_filter"
id="filter_weapon"
x="-2"
posref="ML MR"
posparent="filter_tool"
x="-135"
y="1"
posref="BR BR"
inv_type="#inv_type"
dblink="UI:SAVE:#inv_type:FILTER_WEAPON"
texture="filter_weapon.tga"
tooltip="uittFilterWeapon" />
<instance template="tinv_item_list_filter"
id="filter_armor"
x="-2"
posref="ML MR"
posparent="filter_weapon"
x="-160"
y="1"
posref="BR BR"
inv_type="#inv_type"
dblink="UI:SAVE:#inv_type:FILTER_ARMOR"
texture="filter_armor.tga"
tooltip="uittFilterArmor" />
<!-- search -->
<ctrl type="button"
id="but_inv_search"
button_type="toggle_button"
x="-2"
posref="ML MR"
posparent="but_filter_armor"
tx_normal="w_button_filter_off.tga"
tx_pushed="w_button_filter_on.tga"
tx_over=""
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" />
<!-- details -->
<instance template="tinv_item_list_icon_swap"
id="detail"
x="-4"
y="1"
posref="BR BR"
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" />
</group>
</template>
<!-- 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,15 +11,6 @@
<variable entry="UI:SAVE:MP3_VOLUME"
type="sint64"
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 *-->
<!--******************-->
@ -40,30 +31,13 @@
<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"
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="duration" posref="MR MR" x="0" fontsize="8" shadow="true" color="255 255 255 150" />
<view type="text" id="duration" posref="MR MR" x="0" fontsize="8" shadow="true" color="255 255 255 128" />
</group>
</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"
id="playlist"
posparent="mp3_player"
@ -108,30 +82,6 @@
hardtext="uiPlaylistRefresh"
onclick_l="music_player"
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="songs" x="10" y="0" sizeref="w" posref="TL TL" child_resize_h="true" max_h="215">
@ -217,30 +167,26 @@
tooltip="uiMP3Prev" />
<ctrl type="button"
id="but_play"
button_type="toggle_button"
button_type="push_button"
posref="MM MM"
posparent="slot2"
tx_normal="mp3_button_play.tga"
tx_pushed="mp3_button_pause.tga"
tx_pushed="mp3_button_play.tga"
tx_over="mp3_button_over.tga"
onclick_l="proc"
params_l="proc_mp3_but_play"
onclick_l="music_player"
params_l="play"
tooltip="uiMP3Play" />
<!-- TODO: but_stop is using placeholder texture -->
<ctrl type="button"
id="but_stop"
id="but_pause"
button_type="push_button"
posref="MM MM"
posparent="slot3"
tx_normal="w_button_10_choice.tga"
tx_pushed="w_button_10_choice.tga"
tx_normal="mp3_button_pause.tga"
tx_pushed="mp3_button_pause.tga"
tx_over="mp3_button_over.tga"
scale="true"
w="20"
h="16"
onclick_l="music_player"
params_l="stop"
tooltip="uiMP3Stop" />
params_l="pause"
tooltip="uiMP3Pause" />
<ctrl type="button"
id="but_next"
button_type="push_button"
@ -330,8 +276,6 @@
posref="TL TL"
w="48"
h="20" />
<link expr="@UI:TEMP:MP3_PLAYING" target="but_play:pushed" action="proc" params="proc_mp3_update_tooltip" />
</group>
<!-- SCREEN -->
<group id="screen"

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

@ -97,6 +97,7 @@
<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="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="build_totem" name="uimGcmChooseBuilding" handler="build_totem" params="" />
@ -106,9 +107,6 @@
<action id="move" name="uimGcmMove" handler="context_move" params="" />
<action id="stop" name="uimGcmStopMove" handler="context_stop" params="" />
<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>
<!-- 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 ...)
-- Boss/Mini-bosses/Names colored ring
function game:updateTargetConsiderUI()
-- debugInfo("Updating consider widget")
--debugInfo("Updating consider widget")
local targetWindow = getUI("ui:interface:target")
--
@ -228,14 +228,12 @@ function game:updateTargetConsiderUI()
local wgToolTip = targetWindow:find("target_tooltip")
local wgPvPTag = targetWindow:find("pvp_tags")
local wgHeader = targetWindow:find("header_opened")
local wgLock = targetWindow:find("lock")
wgTargetSlotForce.active = true
wgImpossible.active = true
-- no selection ?
if twGetTargetLevel() == -1 then
wgLock.active = false
wgTargetSlotForce.active = false
wgTargetLevel.active = false
wgImpossible.active = false
@ -256,36 +254,20 @@ function game:updateTargetConsiderUI()
wgPvPTag.active = false
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 (twIsTargetPlayer()) then
-- don't display anything ...
wgLock.active = false
wgTargetSlotForce.active = false
wgTargetLevel.active = false
wgImpossible.active = false
wgSlotRing.active = false
wgToolTip.tooltip = ""
if twIsTargetInPVPMode() then
debugInfo("target in pvp")
wgPvPTag.active = true
wgHeader.h = 56;
end
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
-- 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_max_w="920"
pop_max_h="1600"
w="400"
w="300"
h="400"
movable="true"
active="false"

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

@ -1,42 +0,0 @@
--
-- 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")