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

changement ChaScores

Browse source
This commit is contained in:
deed 2016-09-07 15:52:18 +02:00
parent 917e6b16d4
commit 7cee3bd655
9 changed files with 300 additions and 382 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

252
data/ryz/ryz_zzz_bazaar/config.xml → data/kh/aaa_lirria/config.xml
View file

@ -264,16 +264,16 @@
<variable entry="UI:SAVE:INSCENE:USER:GUILD_NAME" <variable entry="UI:SAVE:INSCENE:USER:GUILD_NAME"
type="bool" type="bool"
value="false" /> value="false" />
<variable entry="UI:SAVE:INSCENE:USER:HP" <variable entry="UI:SAVE:INSCENE:USER:ChaScore1"
type="bool" type="bool"
value="false" /> value="false" />
<variable entry="UI:SAVE:INSCENE:USER:STA" <variable entry="UI:SAVE:INSCENE:USER:ChaScore2"
type="bool" type="bool"
value="false" /> value="false" />
<variable entry="UI:SAVE:INSCENE:USER:SAP" <variable entry="UI:SAVE:INSCENE:USER:ChaScore3"
type="bool" type="bool"
value="false" /> value="false" />
<variable entry="UI:SAVE:INSCENE:USER:FOCUS" <variable entry="UI:SAVE:INSCENE:USER:ChaScore4"
type="bool" type="bool"
value="false" /> value="false" />
<variable entry="UI:SAVE:INSCENE:USER:ACTION" <variable entry="UI:SAVE:INSCENE:USER:ACTION"
@ -300,16 +300,16 @@
<variable entry="UI:SAVE:INSCENE:FRIEND:GUILD_NAME" <variable entry="UI:SAVE:INSCENE:FRIEND:GUILD_NAME"
type="bool" type="bool"
value="true" /> value="true" />
<variable entry="UI:SAVE:INSCENE:FRIEND:HP" <variable entry="UI:SAVE:INSCENE:FRIEND:ChaScore1"
type="bool" type="bool"
value="false" /> value="false" />
<variable entry="UI:SAVE:INSCENE:FRIEND:STA" <variable entry="UI:SAVE:INSCENE:FRIEND:ChaScore2"
type="bool" type="bool"
value="false" /> value="false" />
<variable entry="UI:SAVE:INSCENE:FRIEND:SAP" <variable entry="UI:SAVE:INSCENE:FRIEND:ChaScore3"
type="bool" type="bool"
value="false" /> value="false" />
<variable entry="UI:SAVE:INSCENE:FRIEND:FOCUS" <variable entry="UI:SAVE:INSCENE:FRIEND:ChaScore4"
type="bool" type="bool"
value="false" /> value="false" />
<variable entry="UI:SAVE:INSCENE:FRIEND:MESSAGES" <variable entry="UI:SAVE:INSCENE:FRIEND:MESSAGES"
@ -345,7 +345,7 @@
<variable entry="UI:SAVE:INSCENE:ENEMY:GUILD_NAME" <variable entry="UI:SAVE:INSCENE:ENEMY:GUILD_NAME"
type="bool" type="bool"
value="true" /> value="true" />
<variable entry="UI:SAVE:INSCENE:ENEMY:HP" <variable entry="UI:SAVE:INSCENE:ENEMY:ChaScore1"
type="bool" type="bool"
value="true" /> value="true" />
<variable entry="UI:SAVE:INSCENE:ENEMY:MESSAGES" <variable entry="UI:SAVE:INSCENE:ENEMY:MESSAGES"
@ -357,16 +357,16 @@
<variable entry="UI:SAVE:INSCENE:SOURCE:NAME" <variable entry="UI:SAVE:INSCENE:SOURCE:NAME"
type="bool" type="bool"
value="true" /> value="true" />
<variable entry="UI:SAVE:INSCENE:SOURCE:HP" <variable entry="UI:SAVE:INSCENE:SOURCE:ChaScore1"
type="bool" type="bool"
value="true" /> value="true" />
<variable entry="UI:SAVE:INSCENE:SOURCE:STA" <variable entry="UI:SAVE:INSCENE:SOURCE:ChaScore2"
type="bool" type="bool"
value="true" /> value="true" />
<variable entry="UI:SAVE:INSCENE:SOURCE:SAP" <variable entry="UI:SAVE:INSCENE:SOURCE:ChaScore3"
type="bool" type="bool"
value="true" /> value="true" />
<variable entry="UI:SAVE:INSCENE:SOURCE:FOCUS" <variable entry="UI:SAVE:INSCENE:SOURCE:ChaScore4"
type="bool" type="bool"
value="true" /> value="true" />
<variable entry="UI:SAVE:INSCENE:SOURCE:ACTION" <variable entry="UI:SAVE:INSCENE:SOURCE:ACTION"
@ -583,11 +583,11 @@
<param name="title_offset_x" <param name="title_offset_x"
value="8" /> value="8" />
<param name="title_offset_y" <param name="title_offset_y"
value="-10" /> value="-7" />
<param name="title_offset_openable_x" <param name="title_offset_openable_x"
value="20" /> value="20" />
<param name="title_offset_openable_y" <param name="title_offset_openable_y"
value="-10" /> value="-7" />
<param name="scrollbar_offset_x" <param name="scrollbar_offset_x"
value="6" /> value="6" />
<param name="scrollbar_size_w" <param name="scrollbar_size_w"
@ -732,11 +732,11 @@
<param name="title_offset_x" <param name="title_offset_x"
value="56" /> value="56" />
<param name="title_offset_y" <param name="title_offset_y"
value="-26" /> value="-23" />
<param name="title_offset_openable_x" <param name="title_offset_openable_x"
value="20" /> value="20" />
<param name="title_offset_openable_y" <param name="title_offset_openable_y"
value="-10" /> value="-7" />
<param name="scrollbar_offset_x" <param name="scrollbar_offset_x"
value="6" /> value="6" />
<param name="scrollbar_size_w" <param name="scrollbar_size_w"
@ -873,11 +873,11 @@
<param name="title_offset_x" <param name="title_offset_x"
value="28" /> value="28" />
<param name="title_offset_y" <param name="title_offset_y"
value="-10" /> value="-7" />
<param name="title_offset_openable_x" <param name="title_offset_openable_x"
value="20" /> value="20" />
<param name="title_offset_openable_y" <param name="title_offset_openable_y"
value="-10" /> value="-7" />
<param name="scrollbar_offset_x" <param name="scrollbar_offset_x"
value="6" /> value="6" />
<param name="scrollbar_size_w" <param name="scrollbar_size_w"
@ -1014,11 +1014,11 @@
<param name="title_offset_x" <param name="title_offset_x"
value="8" /> value="8" />
<param name="title_offset_y" <param name="title_offset_y"
value="-6" /> value="-4" />
<param name="title_offset_openable_x" <param name="title_offset_openable_x"
value="18" /> value="18" />
<param name="title_offset_openable_y" <param name="title_offset_openable_y"
value="-6" /> value="-4" />
<param name="header_h" <param name="header_h"
value="14" /> value="14" />
<param name="open_state_tx_opened" <param name="open_state_tx_opened"
@ -1109,11 +1109,11 @@
<param name="title_offset_x" <param name="title_offset_x"
value="8" /> value="8" />
<param name="title_offset_y" <param name="title_offset_y"
value="-5" /> value="-3" />
<param name="title_offset_openable_x" <param name="title_offset_openable_x"
value="20" /> value="20" />
<param name="title_offset_openable_y" <param name="title_offset_openable_y"
value="-5" /> value="-3" />
<param name="header_h" <param name="header_h"
value="12" /> value="12" />
<param name="open_state_tx_opened" <param name="open_state_tx_opened"
@ -1202,11 +1202,11 @@
<param name="title_offset_x" <param name="title_offset_x"
value="8" /> value="8" />
<param name="title_offset_y" <param name="title_offset_y"
value="-5" /> value="-3" />
<param name="title_offset_openable_x" <param name="title_offset_openable_x"
value="22" /> value="22" />
<param name="title_offset_openable_y" <param name="title_offset_openable_y"
value="-5" /> value="-3" />
<param name="header_h" <param name="header_h"
value="10" /> value="10" />
<param name="open_state_tx_opened" <param name="open_state_tx_opened"
@ -1295,11 +1295,11 @@
<param name="title_offset_x" <param name="title_offset_x"
value="18" /> value="18" />
<param name="title_offset_y" <param name="title_offset_y"
value="-5" /> value="-3" />
<param name="title_offset_openable_x" <param name="title_offset_openable_x"
value="24" /> value="24" />
<param name="title_offset_openable_y" <param name="title_offset_openable_y"
value="-5" /> value="-3" />
<param name="header_h" <param name="header_h"
value="10" /> value="10" />
<param name="open_state_tx_opened" <param name="open_state_tx_opened"
@ -1599,11 +1599,11 @@
<param name="title_offset_x" <param name="title_offset_x"
value="8" /> value="8" />
<param name="title_offset_y" <param name="title_offset_y"
value="-6" /> value="-4" />
<param name="title_offset_openable_x" <param name="title_offset_openable_x"
value="18" /> value="18" />
<param name="title_offset_openable_y" <param name="title_offset_openable_y"
value="-6" /> value="-4" />
<param name="header_h" <param name="header_h"
value="14" /> value="14" />
<!-- View state opened/closed (defined TL TL) --> <!-- View state opened/closed (defined TL TL) -->
@ -1698,11 +1698,11 @@
<param name="title_offset_x" <param name="title_offset_x"
value="8" /> value="8" />
<param name="title_offset_y" <param name="title_offset_y"
value="-2" /> value="0" />
<param name="title_offset_openable_x" <param name="title_offset_openable_x"
value="40" /> value="40" />
<param name="title_offset_openable_y" <param name="title_offset_openable_y"
value="-2" /> value="0" />
<param name="header_h" <param name="header_h"
value="12" /> value="12" />
<!-- View state opened/closed (defined TL TL) --> <!-- View state opened/closed (defined TL TL) -->
@ -1916,6 +1916,8 @@ This MUST follow the Enum MISSION_DESC::TIconId
value="basic.ttf" /> --> value="basic.ttf" /> -->
<param name="font" <param name="font"
value="ryzom.ttf" /> value="ryzom.ttf" />
<param name="monospace_font"
value="ryzom_monospace.ttf" />
<param name="add_coef_font" <param name="add_coef_font"
value="1" /> value="1" />
<param name="mul_coef_anim" <param name="mul_coef_anim"
@ -2111,76 +2113,76 @@ This MUST follow the Enum MISSION_DESC::TIconId
<define id="win_priority_highest" <define id="win_priority_highest"
value="5" /> value="5" />
<!-- For bars, -1024 to +1024 "percent" values from CBarManager --> <!-- For bars, -1024 to +1024 "percent" values from CBarManager -->
<define id="player_hp_percent" <define id="player_ChaScore1_percent"
value="UI:VARIABLES:USER:HP_RATIO" /> value="UI:VARIABLES:USER:ChaScore1_RATIO" />
<define id="player_sta_percent" <define id="player_ChaScore2_percent"
value="UI:VARIABLES:USER:STA_RATIO" /> value="UI:VARIABLES:USER:ChaScore2_RATIO" />
<define id="player_sap_percent" <define id="player_ChaScore3_percent"
value="UI:VARIABLES:USER:SAP_RATIO" /> value="UI:VARIABLES:USER:ChaScore3_RATIO" />
<define id="player_focus_percent" <define id="player_ChaScore4_percent"
value="UI:VARIABLES:USER:FOCUS_RATIO" /> value="UI:VARIABLES:USER:ChaScore4_RATIO" />
<define id="player_percent_max" <define id="player_percent_max"
value="1024" /> value="1024" />
<!-- For character sheet numerical values from database --> <!-- For character sheet numerical values from database -->
<define id="player_hp" <define id="player_ChaScore1"
value="UI:VARIABLES:USER:HP" /> value="UI:VARIABLES:USER:ChaScore1" />
<!-- Local because sent by impulse --> <!-- Local because sent by impulse -->
<define id="player_hp_max" <define id="player_ChaScore1_max"
value="SERVER:CHARACTER_INFO:SCORES0:Max" /> value="SERVER:CHARACTER_INFO:SCORES0:Max" />
<define id="player_hp_base" <define id="player_ChaScore1_base"
value="SERVER:CHARACTER_INFO:SCORES0:Base" /> value="SERVER:CHARACTER_INFO:SCORES0:Base" />
<define id="player_sta" <define id="player_ChaScore2"
value="UI:VARIABLES:USER:STA" /> value="UI:VARIABLES:USER:ChaScore2" />
<!-- Local because sent by impulse --> <!-- Local because sent by impulse -->
<define id="player_sta_max" <define id="player_ChaScore2_max"
value="SERVER:CHARACTER_INFO:SCORES1:Max" /> value="SERVER:CHARACTER_INFO:SCORES1:Max" />
<define id="player_sta_base" <define id="player_ChaScore2_base"
value="SERVER:CHARACTER_INFO:SCORES1:Base" /> value="SERVER:CHARACTER_INFO:SCORES1:Base" />
<define id="player_sap" <define id="player_ChaScore3"
value="UI:VARIABLES:USER:SAP" /> value="UI:VARIABLES:USER:ChaScore3" />
<!-- Local because sent by impulse --> <!-- Local because sent by impulse -->
<define id="player_sap_max" <define id="player_ChaScore3_max"
value="SERVER:CHARACTER_INFO:SCORES2:Max" /> value="SERVER:CHARACTER_INFO:SCORES2:Max" />
<define id="player_sap_base" <define id="player_ChaScore3_base"
value="SERVER:CHARACTER_INFO:SCORES2:Base" /> value="SERVER:CHARACTER_INFO:SCORES2:Base" />
<define id="player_focus" <define id="player_ChaScore4"
value="UI:VARIABLES:USER:FOCUS" /> value="UI:VARIABLES:USER:ChaScore4" />
<!-- Local because sent by impulse --> <!-- Local because sent by impulse -->
<define id="player_focus_max" <define id="player_ChaScore4_max"
value="SERVER:CHARACTER_INFO:SCORES3:Max" /> value="SERVER:CHARACTER_INFO:SCORES3:Max" />
<define id="player_focus_base" <define id="player_ChaScore4_base"
value="SERVER:CHARACTER_INFO:SCORES3:Base" /> value="SERVER:CHARACTER_INFO:SCORES3:Base" />
<define id="player_hpreg" <define id="player_ChaScore1reg"
value="SERVER:CHARACTER_INFO:SCORES0:Regen" /> value="SERVER:CHARACTER_INFO:SCORES0:Regen" />
<define id="player_hpreg_base" <define id="player_ChaScore1reg_base"
value="SERVER:CHARACTER_INFO:SCORES0:BaseRegen" /> value="SERVER:CHARACTER_INFO:SCORES0:BaseRegen" />
<define id="player_stareg" <define id="player_ChaScore2reg"
value="SERVER:CHARACTER_INFO:SCORES1:Regen" /> value="SERVER:CHARACTER_INFO:SCORES1:Regen" />
<define id="player_stareg_base" <define id="player_ChaScore2reg_base"
value="SERVER:CHARACTER_INFO:SCORES1:BaseRegen" /> value="SERVER:CHARACTER_INFO:SCORES1:BaseRegen" />
<define id="player_sapreg" <define id="player_ChaScore3reg"
value="SERVER:CHARACTER_INFO:SCORES2:Regen" /> value="SERVER:CHARACTER_INFO:SCORES2:Regen" />
<define id="player_sapreg_base" <define id="player_ChaScore3reg_base"
value="SERVER:CHARACTER_INFO:SCORES2:BaseRegen" /> value="SERVER:CHARACTER_INFO:SCORES2:BaseRegen" />
<define id="player_focreg" <define id="player_ChaScore4reg"
value="SERVER:CHARACTER_INFO:SCORES3:Regen" /> value="SERVER:CHARACTER_INFO:SCORES3:Regen" />
<define id="player_focreg_base" <define id="player_ChaScore4reg_base"
value="SERVER:CHARACTER_INFO:SCORES3:BaseRegen" /> value="SERVER:CHARACTER_INFO:SCORES3:BaseRegen" />
<define id="player_carac_hpmax" <define id="player_carac_ChaScore1max"
value="SERVER:CHARACTER_INFO:CHARACTERISTICS0:VALUE" /> value="SERVER:CHARACTER_INFO:CHARACTERISTICS0:VALUE" />
<define id="player_carac_hpreg" <define id="player_carac_ChaScore1reg"
value="SERVER:CHARACTER_INFO:CHARACTERISTICS1:VALUE" /> value="SERVER:CHARACTER_INFO:CHARACTERISTICS1:VALUE" />
<define id="player_carac_sapmax" <define id="player_carac_ChaScore3max"
value="SERVER:CHARACTER_INFO:CHARACTERISTICS2:VALUE" /> value="SERVER:CHARACTER_INFO:CHARACTERISTICS2:VALUE" />
<define id="player_carac_sapreg" <define id="player_carac_ChaScore3reg"
value="SERVER:CHARACTER_INFO:CHARACTERISTICS3:VALUE" /> value="SERVER:CHARACTER_INFO:CHARACTERISTICS3:VALUE" />
<define id="player_carac_stamax" <define id="player_carac_ChaScore2max"
value="SERVER:CHARACTER_INFO:CHARACTERISTICS4:VALUE" /> value="SERVER:CHARACTER_INFO:CHARACTERISTICS4:VALUE" />
<define id="player_carac_stareg" <define id="player_carac_ChaScore2reg"
value="SERVER:CHARACTER_INFO:CHARACTERISTICS5:VALUE" /> value="SERVER:CHARACTER_INFO:CHARACTERISTICS5:VALUE" />
<define id="player_carac_wishmax" <define id="player_carac_ChaScore4max"
value="SERVER:CHARACTER_INFO:CHARACTERISTICS6:VALUE" /> value="SERVER:CHARACTER_INFO:CHARACTERISTICS6:VALUE" />
<define id="player_carac_wishreg" <define id="player_carac_ChaScore4reg"
value="SERVER:CHARACTER_INFO:CHARACTERISTICS7:VALUE" /> value="SERVER:CHARACTER_INFO:CHARACTERISTICS7:VALUE" />
<define id="player_protect_acid" <define id="player_protect_acid"
value="SERVER:CHARACTER_INFO:MAGIC_PROTECTION:0:VALUE" /> value="SERVER:CHARACTER_INFO:MAGIC_PROTECTION:0:VALUE" />
@ -2765,6 +2767,9 @@ This MUST follow the Enum MISSION_DESC::TIconId
<variable entry="UI:SAVE:SHOW_CLOCK" <variable entry="UI:SAVE:SHOW_CLOCK"
type="bool" type="bool"
value="false" /> value="false" />
<variable entry="UI:SAVE:SHOW_CLOCK_12H"
type="bool"
value="false" />
<variable entry="UI:SAVE:SHOW_RETICLE" <variable entry="UI:SAVE:SHOW_RETICLE"
type="bool" type="bool"
value="true" /> value="true" />
@ -2882,15 +2887,12 @@ This MUST follow the Enum MISSION_DESC::TIconId
type="bool" type="bool"
value="true" /> value="true" />
<!-- Blend between day and night (lightLevel = 0 day) (lightLevel = 1 night) --> <!-- Blend between day and night (lightLevel = 0 day) (lightLevel = 1 night) -->
<link expr="depends(@UI:VARIABLES:CURRENT_TIME)" <link expr="identity(ilinear(getLightLevel(), getRed(intToColor(@UI:SAVE:DAY_COLOR)), getRed(intToColor(@UI:SAVE:NIGHT_COLOR))), @UI:VARIABLES:CURRENT_TIME)"
action="set" target="@UI:SAVE:COLOR:R" />
params="dblink=UI:SAVE:COLOR:R|value=ilinear(getLightLevel(), getRed(intToColor(@UI:SAVE:DAY_COLOR)), getRed(intToColor(@UI:SAVE:NIGHT_COLOR)))" /> <link expr="identity(ilinear(getLightLevel(), getGreen(intToColor(@UI:SAVE:DAY_COLOR)), getGreen(intToColor(@UI:SAVE:NIGHT_COLOR))), @UI:VARIABLES:CURRENT_TIME)"
<link expr="depends(@UI:VARIABLES:CURRENT_TIME)" target="@UI:SAVE:COLOR:G" />
action="set" <link expr="identity(ilinear(getLightLevel(), getBlue(intToColor(@UI:SAVE:DAY_COLOR)), getBlue(intToColor(@UI:SAVE:NIGHT_COLOR))), @UI:VARIABLES:CURRENT_TIME)"
params="dblink=UI:SAVE:COLOR:G|value=ilinear(getLightLevel(), getGreen(intToColor(@UI:SAVE:DAY_COLOR)), getGreen(intToColor(@UI:SAVE:NIGHT_COLOR)))" /> target="@UI:SAVE:COLOR:B" />
<link expr="depends(@UI:VARIABLES:CURRENT_TIME)"
action="set"
params="dblink=UI:SAVE:COLOR:B|value=ilinear(getLightLevel(), getBlue(intToColor(@UI:SAVE:DAY_COLOR)), getBlue(intToColor(@UI:SAVE:NIGHT_COLOR)))" />
<!--<link expr="depends(@UI:VARIABLES:CURRENT_TIME)" action="set" <!--<link expr="depends(@UI:VARIABLES:CURRENT_TIME)" action="set"
params="dblink=UI:SAVE:COLOR:A|value=ilinear(getLightLevel(), @UI:SAVE:DAY_COLOR:A, @UI:SAVE:NIGHT_COLOR:A)" />--> params="dblink=UI:SAVE:COLOR:A|value=ilinear(getLightLevel(), @UI:SAVE:DAY_COLOR:A, @UI:SAVE:NIGHT_COLOR:A)" />-->
<!-- The User Target Slot and UID --> <!-- The User Target Slot and UID -->
@ -2923,13 +2925,13 @@ This MUST follow the Enum MISSION_DESC::TIconId
<!-- ************************** --> <!-- ************************** -->
<!-- * PLAYER JAUGES DISPLAY * --> <!-- * PLAYER JAUGES DISPLAY * -->
<!-- ************************** --> <!-- ************************** -->
<variable entry="UI:SAVE:PLAYER:DISP_SAP" <variable entry="UI:SAVE:PLAYER:DISP_ChaScore3"
type="sint32" type="sint32"
value="1" /> value="1" />
<variable entry="UI:SAVE:PLAYER:DISP_STA" <variable entry="UI:SAVE:PLAYER:DISP_ChaScore2"
type="sint32" type="sint32"
value="1" /> value="1" />
<variable entry="UI:SAVE:PLAYER:DISP_FOC" <variable entry="UI:SAVE:PLAYER:DISP_ChaScore4"
type="sint32" type="sint32"
value="1" /> value="1" />
<!-- If player wants the Current Action window out of the player window --> <!-- If player wants the Current Action window out of the player window -->
@ -3321,9 +3323,6 @@ This MUST follow the Enum MISSION_DESC::TIconId
<variable entry="UI:SAVE:ISDETACHED:REGION_CHAT" <variable entry="UI:SAVE:ISDETACHED:REGION_CHAT"
type="sint32" type="sint32"
value="0" /> value="0" />
<variable entry="UI:SAVE:ISDETACHED:YUBO_CHAT"
type="sint32"
value="0" />
<variable entry="UI:SAVE:ISENABLED:AROUND_ME" <variable entry="UI:SAVE:ISENABLED:AROUND_ME"
type="sint32" type="sint32"
value="1" /> value="1" />
@ -3342,9 +3341,6 @@ This MUST follow the Enum MISSION_DESC::TIconId
<variable entry="UI:SAVE:ISENABLED:SYSTEM_INFO" <variable entry="UI:SAVE:ISENABLED:SYSTEM_INFO"
type="sint32" type="sint32"
value="1" /> value="1" />
<variable entry="UI:SAVE:ISENABLED:YUBO_CHAT"
type="sint32"
value="1" />
<!-- List Menu 5 --> <!-- List Menu 5 -->
<variable entry="UI:VARIABLES:ISACTIVE:BONUS_MALUS" <variable entry="UI:VARIABLES:ISACTIVE:BONUS_MALUS"
type="sint32" type="sint32"
@ -3470,15 +3466,15 @@ This MUST follow the Enum MISSION_DESC::TIconId
<!-- ***************************** --> <!-- ***************************** -->
<!-- * COMMON DEFINE COLORS * --> <!-- * COMMON DEFINE COLORS * -->
<!-- ***************************** --> <!-- ***************************** -->
<define id="hp_color" <define id="ChaScore1_color"
value="255 64 0 255" /> value="255 64 0 255" />
<define id="hp_color_neg" <define id="ChaScore1_color_neg"
value="127 32 0 255" /> value="127 32 0 255" />
<define id="sta_color" <define id="ChaScore2_color"
value="255 0 255 255" /> value="255 0 255 255" />
<define id="sap_color" <define id="ChaScore3_color"
value="72 255 0 255" /> value="72 255 0 255" />
<define id="focus_color" <define id="ChaScore4_color"
value="0 128 255 255" /> value="0 128 255 255" />
<define id="bulk_color" <define id="bulk_color"
value="215 185 75 255" /> value="215 185 75 255" />
@ -3705,27 +3701,13 @@ This MUST follow the Enum MISSION_DESC::TIconId
<define id="item_type_to_item_sheet_JOB_ELEMENT" <define id="item_type_to_item_sheet_JOB_ELEMENT"
value="rpjob_elementary.sitem" /> value="rpjob_elementary.sitem" />
<!-- ************************ --> <!-- ************************ -->
<!-- * YUBO CHAT * -->
<!-- ************************ -->
<!--
The Yubo Chat is a special telnet chat for Game Masters, same channel as the Yubo Klient
-->
<variable entry="UI:VARIABLES:ISACTIVE:YUBO_CHAT"
type="sint32"
value="0" />
<variable entry="UI:VARIABLES:YUBO_CHAT_PRESENT"
type="sint32"
value="0" />
<define id="is_yubo_chat_present"
value="ne(@UI:VARIABLES:YUBO_CHAT_PRESENT,0)" />
<!-- ************************ -->
<!-- * DYNAMIC CHAT * --> <!-- * DYNAMIC CHAT * -->
<!-- ************************ --> <!-- ************************ -->
<define id="max_dyn_chan_per_player" <define id="max_dyn_chan_per_player"
value_from_code="getMaxDynChanPerPlayer()" /> value_from_code="getMaxDynChanPerPlayer()" />
<variable entry="UI:SAVE:ISDETACHED:DYNAMIC_CHAT$i" <variable entry="UI:SAVE:ISDETACHED:DYNAMIC_CHAT$i"
type="sint32" type="sint32"
value="1" value="0"
size="%max_dyn_chan_per_player" /> size="%max_dyn_chan_per_player" />
<variable entry="UI:SAVE:ISENABLED:DYNAMIC_CHAT$i" <variable entry="UI:SAVE:ISENABLED:DYNAMIC_CHAT$i"
type="sint32" type="sint32"
@ -3769,69 +3751,69 @@ This MUST follow the Enum MISSION_DESC::TIconId
value_from_code="getMaxTeamMember()" /> value_from_code="getMaxTeamMember()" />
<define id="max_fame_tribe" <define id="max_fame_tribe"
value_from_code="lua:getNbTribeFameIndex()" /> value_from_code="lua:getNbTribeFameIndex()" />
<!-- Team Members (FOCUS not setuped) --> <!-- Team Members (ChaScore4 not setuped) -->
<variable entry="UI:VARIABLES:BARS:TEAM:$i:HP" <variable entry="UI:VARIABLES:BARS:TEAM:$i:ChaScore1"
type="sint32" type="sint32"
value="0" value="0"
size="%max_team_member" /> size="%max_team_member" />
<variable entry="UI:VARIABLES:BARS:TEAM:$i:STA" <variable entry="UI:VARIABLES:BARS:TEAM:$i:ChaScore2"
type="sint32" type="sint32"
value="0" value="0"
size="%max_team_member" /> size="%max_team_member" />
<variable entry="UI:VARIABLES:BARS:TEAM:$i:SAP" <variable entry="UI:VARIABLES:BARS:TEAM:$i:ChaScore3"
type="sint32" type="sint32"
value="0" value="0"
size="%max_team_member" /> size="%max_team_member" />
<!-- Animal (only HP) --> <!-- Animal (only ChaScore1) -->
<variable entry="UI:VARIABLES:BARS:ANIMAL:$i:HP" <variable entry="UI:VARIABLES:BARS:ANIMAL:$i:ChaScore1"
type="sint32" type="sint32"
value="0" value="0"
size="%max_animal" /> size="%max_animal" />
<!-- Target --> <!-- Target -->
<variable entry="UI:VARIABLES:BARS:TARGET:HP" <variable entry="UI:VARIABLES:BARS:TARGET:ChaScore1"
type="sint32" type="sint32"
value="0" /> value="0" />
<variable entry="UI:VARIABLES:BARS:TARGET:STA" <variable entry="UI:VARIABLES:BARS:TARGET:ChaScore2"
type="sint32" type="sint32"
value="0" /> value="0" />
<variable entry="UI:VARIABLES:BARS:TARGET:SAP" <variable entry="UI:VARIABLES:BARS:TARGET:ChaScore3"
type="sint32" type="sint32"
value="0" /> value="0" />
<variable entry="UI:VARIABLES:BARS:TARGET:FOCUS" <variable entry="UI:VARIABLES:BARS:TARGET:ChaScore4"
type="sint32" type="sint32"
value="0" /> value="0" />
<define id="target_hp" <define id="target_ChaScore1"
value="UI:VARIABLES:BARS:TARGET:HP" /> value="UI:VARIABLES:BARS:TARGET:ChaScore1" />
<define id="target_sta" <define id="target_ChaScore2"
value="UI:VARIABLES:BARS:TARGET:STA" /> value="UI:VARIABLES:BARS:TARGET:ChaScore2" />
<define id="target_sap" <define id="target_ChaScore3"
value="UI:VARIABLES:BARS:TARGET:SAP" /> value="UI:VARIABLES:BARS:TARGET:ChaScore3" />
<define id="target_focus" <define id="target_ChaScore4"
value="UI:VARIABLES:BARS:TARGET:FOCUS" /> value="UI:VARIABLES:BARS:TARGET:ChaScore4" />
<!-- Special USER. -1024 to +1024 "percent" values --> <!-- Special USER. -1024 to +1024 "percent" values -->
<variable entry="UI:VARIABLES:USER:HP_RATIO" <variable entry="UI:VARIABLES:USER:ChaScore1_RATIO"
type="sint32" type="sint32"
value="0" /> value="0" />
<variable entry="UI:VARIABLES:USER:STA_RATIO" <variable entry="UI:VARIABLES:USER:ChaScore2_RATIO"
type="sint32" type="sint32"
value="0" /> value="0" />
<variable entry="UI:VARIABLES:USER:SAP_RATIO" <variable entry="UI:VARIABLES:USER:ChaScore3_RATIO"
type="sint32" type="sint32"
value="0" /> value="0" />
<variable entry="UI:VARIABLES:USER:FOCUS_RATIO" <variable entry="UI:VARIABLES:USER:ChaScore4_RATIO"
type="sint32" type="sint32"
value="0" /> value="0" />
<!-- Special USER: Actual 0 to 32767 "real clamped to 0" values --> <!-- Special USER: Actual 0 to 32767 "real clamped to 0" values -->
<variable entry="UI:VARIABLES:USER:HP" <variable entry="UI:VARIABLES:USER:ChaScore1"
type="sint32" type="sint32"
value="0" /> value="0" />
<variable entry="UI:VARIABLES:USER:STA" <variable entry="UI:VARIABLES:USER:ChaScore2"
type="sint32" type="sint32"
value="0" /> value="0" />
<variable entry="UI:VARIABLES:USER:SAP" <variable entry="UI:VARIABLES:USER:ChaScore3"
type="sint32" type="sint32"
value="0" /> value="0" />
<variable entry="UI:VARIABLES:USER:FOCUS" <variable entry="UI:VARIABLES:USER:ChaScore4"
type="sint32" type="sint32"
value="0" /> value="0" />
<!-- AH when Target Bars change from DB --> <!-- AH when Target Bars change from DB -->

0
data/ryz/ryz_zzz_bazaar/game_r2_loading.lua → data/kh/aaa_lirria/game_r2_loading.lua
View file

0
data/ryz/ryz_zzz_bazaar/keys.xml → data/kh/aaa_lirria/keys.xml
View file

0
data/ryz/ryz_zzz_bazaar/keys_bi.wasd.xml → data/kh/aaa_lirria/keys_bi.wasd.xml
View file

0
data/ryz/ryz_zzz_bazaar/keys_bi.zqsd.xml → data/kh/aaa_lirria/keys_bi.zqsd.xml
View file

12
data/ryz/ryz_ring/ring_window.xml → data/kh/aaa_lirria/ring_window.xml
View file

@ -1077,15 +1077,15 @@
<group id="valid_scenario_control" sizeref="w" child_resize_h="true" w="0" posparent="invite_team" <group id="valid_scenario_control" sizeref="w" child_resize_h="true" w="0" posparent="invite_team"
posref="BL TL" x="0" y="-5" > posref="BL TL" x="0" y="-5" >
<ctrl style="button_ok" id="ok_button" x="-50" y="0" posref="TM TM" text_y="-2" <ctrl style="button_ok" id="ok_button" x="-50" y="0" posref="TM TM" text_y="0"
onclick_l="load_scenario" params_l="" hardtext="uittOK" wmin="100" onclick_l="load_scenario" params_l="" hardtext="uittOK" wmin="100"
tooltip="uiRingLaunchScenarioTooltip" tooltip="uiRingLaunchScenarioTooltip"
tooltip_parent="win" /> tooltip_parent="win" />
<ctrl style="button_ok" id="cancel_button" x="10" y="0" posparent="ok_button" posref="BR BL" text_y="-2" <ctrl style="button_ok" id="cancel_button" x="10" y="0" posparent="ok_button" posref="BR BL" text_y="0"
onclick_l="proc" params_l="scenario_control_close" hardtext="uittCancel" wmin="100" /> onclick_l="proc" params_l="scenario_control_close" hardtext="uittCancel" wmin="100" />
<ctrl style="button_ok" id="load_button" x="10" y="0" posref="TL TL" text_y="-2" <ctrl style="button_ok" id="load_button" x="10" y="0" posref="TL TL" text_y="0"
onclick_l="lua" params_l="GameR2Loading:displayLoadingWindow()" hardtext="uiR2EDChooseScenario" wmin="100" /> onclick_l="lua" params_l="GameR2Loading:displayLoadingWindow()" hardtext="uiR2EDChooseScenario" wmin="100" />
</group> </group>
@ -1650,10 +1650,10 @@
<instance template="score_template" id="direction_rate" x="0" y="-13" posref="BL TL" posparent="originality_rate" <instance template="score_template" id="direction_rate" x="0" y="-13" posref="BL TL" posparent="originality_rate"
hardtext="uiRAP_RateDirection" /> hardtext="uiRAP_RateDirection" />
<ctrl style="button_ok" id="ok" x="30" y="15" posref="BM BM" posparent="parent" text_y="-2" <ctrl style="button_ok" id="ok" x="30" y="15" posref="BM BM" posparent="parent" text_y="0"
onclick_l="lua" params_l="ScenarioScores:updateScores()" hardtext="uittOK" wmin="50" /> onclick_l="lua" params_l="ScenarioScores:updateScores()" hardtext="uittOK" wmin="50" />
<ctrl style="button_ok" id="cancel" x="-30" y="15" posref="BM BM" posparent="parent" text_y="-2" <ctrl style="button_ok" id="cancel" x="-30" y="15" posref="BM BM" posparent="parent" text_y="0"
onclick_l="lua" params_l="ScenarioScores:getWindow().active=false" hardtext="uittCancel" wmin="50" /> onclick_l="lua" params_l="ScenarioScores:getWindow().active=false" hardtext="uittCancel" wmin="50" />
</group> </group>
@ -1679,7 +1679,7 @@
<instance template="average_score_template" id="direction_rate" x="0" y="-13" posref="BL TL" posparent="originality_rate" <instance template="average_score_template" id="direction_rate" x="0" y="-13" posref="BL TL" posparent="originality_rate"
hardtext="uiRAP_RateDirection" /> hardtext="uiRAP_RateDirection" />
<ctrl style="button_ok" id="ok" x="30" y="15" posref="BM BM" posparent="parent" text_y="-2" <ctrl style="button_ok" id="ok" x="30" y="15" posref="BM BM" posparent="parent" text_y="0"
onclick_l="lua" params_l="getUI('ui:interface:r2ed_scenario_scores').active=false" hardtext="uittOK" wmin="50" /> onclick_l="lua" params_l="getUI('ui:interface:r2ed_scenario_scores').active=false" hardtext="uittOK" wmin="50" />
</group> </group>

68
data/kh/kh_interfaces/actions.xml
View file

@ -124,20 +124,6 @@
<value value="10" hardtext="uiNumber10"/> <value value="10" hardtext="uiNumber10"/>
</parameter> </parameter>
</action> </action>
<action name="select_shortcut_bar_2" hardtext="uiSelectShortcutBar2" contexts="game, r2ed_anim_test">
<parameter hardtext="uiShortcutBarNumber">
<value value="1" hardtext="uiNumber01"/>
<value value="2" hardtext="uiNumber02"/>
<value value="3" hardtext="uiNumber03"/>
<value value="4" hardtext="uiNumber04"/>
<value value="5" hardtext="uiNumber05"/>
<value value="6" hardtext="uiNumber06"/>
<value value="7" hardtext="uiNumber07"/>
<value value="8" hardtext="uiNumber08"/>
<value value="9" hardtext="uiNumber09"/>
<value value="10" hardtext="uiNumber10"/>
</parameter>
</action>
<action name="run_shortcut" hardtext="uiRunShortcut" contexts="game, r2ed_anim_test"> <action name="run_shortcut" hardtext="uiRunShortcut" contexts="game, r2ed_anim_test">
<parameter hardtext="uiShortcutNumber"> <parameter hardtext="uiShortcutNumber">
<value value="00" hardtext="uiNumber01"/> <value value="00" hardtext="uiNumber01"/>
@ -211,13 +197,6 @@
</parameter> </parameter>
</action> </action>
<action name="no_target" hardtext="uiNoTarget" /> <action name="no_target" hardtext="uiNoTarget" />
<action name="target" hardtext="uiTargetCmd" >
<parameter hardtext="uiTargetCmdEntity" type="%action_param_user_name" name="entity"/>
</action>
<action name="assist" hardtext="uiAssistCmd" contexts="game">
<parameter hardtext="uiAssistCmdEntity" type="%action_param_user_name" name="entity"/>
</action>
<action name="assist_target" hardtext="uiAssistTargetCmd" contexts="game, r2ed_anim_test"/>
<action name="toggle_dodge_parry" hardtext="uiToggleDodgeParry"/> <action name="toggle_dodge_parry" hardtext="uiToggleDodgeParry"/>
</action_category> </action_category>
@ -225,51 +204,10 @@
<action name="cycle_tell" hardtext="uiCycleTell"/> <action name="cycle_tell" hardtext="uiCycleTell"/>
<action name="talk_untalk" hardtext="uiTalkLeave"/> <action name="talk_untalk" hardtext="uiTalkLeave"/>
<action name="reply_teller" hardtext="uiReplyTeller"/> <action name="reply_teller" hardtext="uiReplyTeller"/>
<action name="enter_tell" hardtext="uiEnterTellCmd">
<parameter hardtext="uiTellCmdDest" type="%action_param_user_name" name="player"/>
</action>
<action name="tell" hardtext="uiTellCmd">
<parameter hardtext="uiTellCmdDest" type="%action_param_user_name" name="player"/>
<parameter hardtext="uiTellCmdMsg" type="%action_param_user" name="text"/>
</action>
<action name="enter_talk" hardtext="uiEnterTalkCmd">
<parameter hardtext="uiTalkCmdMode" type="%action_param_constant" name="mode" value="0">
<value value="0" hardtext="uiTalkCmdModeSay"/>
<value value="1" hardtext="uiTalkCmdModeShout"/>
<value value="2" hardtext="uiTalkCmdModeTeam"/>
<value value="3" hardtext="uiTalkCmdModeGuild"/>
<!--<value value="4" hardtext="uiTalkCmdModeCivilisation"/>
<value value="5" hardtext="uiTalkCmdModeTerritory"/>
<value value="6" hardtext="uiTalkCmdModeUniverse"/>-->
<!-- 7 tell
8 player
9 arround
10 system -->
<value value="11" hardtext="uiTalkCmdModeRegion"/>
</parameter>
</action>
<action name="talk" hardtext="uiTalkCmd">
<parameter hardtext="uiTalkCmdMode" type="%action_param_constant" name="mode" value="0">
<value value="0" hardtext="uiTalkCmdModeSay"/>
<value value="1" hardtext="uiTalkCmdModeShout"/>
<value value="2" hardtext="uiTalkCmdModeTeam"/>
<value value="3" hardtext="uiTalkCmdModeGuild"/>
<!--<value value="4" hardtext="uiTalkCmdModeCivilisation"/>
<value value="5" hardtext="uiTalkCmdModeTerritory"/>
<value value="6" hardtext="uiTalkCmdModeUniverse"/>-->
<!-- 7 tell
8 player
9 arround
10 system -->
<value value="11" hardtext="uiTalkCmdModeRegion"/>
</parameter>
<parameter hardtext="uiTalkCmdMsg" type="%action_param_user" name="text"/>
</action>
</action_category> </action_category>
<action_category name="edit" hardtext="uiEdit" contexts="game, r2ed, r2ed_anim_test, r2ed_anim_dm"> <action_category name="edit" hardtext="uiEdit" contexts="game, r2ed, r2ed_anim_test, r2ed_anim_dm">
<action name="edit_goto_line_begin" hardtext="uiEditGotoLineBegin"/> <action name="edit_goto_line_begin" hardtext="uiEditGotoLineBegin"/>
<action name="edit_goto_line_end" hardtext="uiEditGotoLineEnd"/> <action name="edit_goto_line_end" hardtext="uiEditGotoLineEnd"/>
<action name="edit_goto_block_begin" hardtext="uiEditGotoBlockBegin"/> <action name="edit_goto_block_begin" hardtext="uiEditGotoBlockBegin"/>
<action name="edit_goto_block_end" hardtext="uiEditGotoBlockEnd"/> <action name="edit_goto_block_end" hardtext="uiEditGotoBlockEnd"/>
@ -282,13 +220,12 @@
<action name="edit_copy" hardtext="uiEditCopy"/> <action name="edit_copy" hardtext="uiEditCopy"/>
<action name="edit_paste" hardtext="uiEditPaste" repeat="1"/> <action name="edit_paste" hardtext="uiEditPaste" repeat="1"/>
<action name="edit_cut" hardtext="uiEditCut"/> <action name="edit_cut" hardtext="uiEditCut"/>
<action name="edit_delete_char" hardtext="uiEditDeleteChar" repeat="1"/>
<action name="edit_expand_or_cycle_tell" hardtext="uiEditExpandOrCycleTell"/> <action name="edit_expand_or_cycle_tell" hardtext="uiEditExpandOrCycleTell"/>
<action name="edit_back" hardtext="uiEditBack" repeat="1"/> <action name="edit_back" hardtext="uiEditBack" repeat="1"/>
<action name="edit_select_to_line_begin" hardtext="uiEditSelectToLineBegin"/> <action name="edit_select_to_line_begin" hardtext="uiEditSelectToLineBegin"/>
<action name="edit_select_to_line_end" hardtext="uiEditSelectToLineEnd"/> <action name="edit_select_to_line_end" hardtext="uiEditSelectToLineEnd"/>
<action name="edit_select_to_block_begin" hardtext="uiEditSelectToBlockBegin"/> <action name="edit_select_to_block_begin" hardtext="uiEditSelectToBlockBegin"/>
<action name="edit_select_to_block_end" hardtext="uiEditSelectToBlockEnd"/> <action name="edit_select_to_block_end" hardtext="uiEditSelectToBlockEnd"/>
<action name="edit_select_previous_word" hardtext="uiEditSelectPreviousWord" repeat="1"/> <action name="edit_select_previous_word" hardtext="uiEditSelectPreviousWord" repeat="1"/>
<action name="edit_select_next_word" hardtext="uiEditSelectNextWord" repeat="1"/> <action name="edit_select_next_word" hardtext="uiEditSelectNextWord" repeat="1"/>
<action name="edit_select_previous_char" hardtext="uiEditSelectPreviousChar" repeat="1"/> <action name="edit_select_previous_char" hardtext="uiEditSelectPreviousChar" repeat="1"/>
@ -297,7 +234,6 @@
</action_category> </action_category>
<action_category name="windows" hardtext="uiWindows" contexts="game, r2ed, r2ed_anim_test, r2ed_anim_dm"> <action_category name="windows" hardtext="uiWindows" contexts="game, r2ed, r2ed_anim_test, r2ed_anim_dm">
<action name="toggle_chat" hardtext="uiToggleChat"/>
<action name="open" hardtext="uiOpenWindow"> <action name="open" hardtext="uiOpenWindow">
<parameter hardtext="uiWindowName"> <parameter hardtext="uiWindowName">
<instance template="openable_window_list"/> <instance template="openable_window_list"/>

322
data/kh/kh_interfaces/info_player.xml
View file

@ -57,7 +57,7 @@
<view type="text" <view type="text"
id="t" id="t"
posref="TL TL" posref="TL TL"
y="-1" y="0"
color="255 255 255 255" color="255 255 255 255"
fontsize="12" fontsize="12"
shadow="true" shadow="true"
@ -66,7 +66,7 @@
id="max" id="max"
posref="MR MR" posref="MR MR"
x="-4" x="-4"
y="-2" y="0"
color="255 255 255 255" color="255 255 255 255"
shadow="true" shadow="true"
fontsize="12" fontsize="12"
@ -76,7 +76,7 @@
id="sep" id="sep"
posparent="max" posparent="max"
posref="TL TR" posref="TL TR"
x="-1" x="0"
color="255 255 255 255" color="255 255 255 255"
shadow="true" shadow="true"
fontsize="12" fontsize="12"
@ -128,7 +128,7 @@
<view type="text" <view type="text"
id="t" id="t"
posref="TL TL" posref="TL TL"
y="-1" y="0"
color="255 255 255 255" color="255 255 255 255"
fontsize="12" fontsize="12"
shadow="true" shadow="true"
@ -137,7 +137,7 @@
id="val" id="val"
posref="MR MR" posref="MR MR"
x="-4" x="-4"
y="-2" y="0"
color="255 255 255 255" color="255 255 255 255"
shadow="true" shadow="true"
fontsize="12" fontsize="12"
@ -176,7 +176,7 @@
<view type="text" <view type="text"
id="t" id="t"
posref="TL TL" posref="TL TL"
y="-1" y="0"
color="255 255 255 255" color="255 255 255 255"
fontsize="12" fontsize="12"
shadow="true" shadow="true"
@ -185,7 +185,7 @@
id="val" id="val"
posref="MR MR" posref="MR MR"
x="-4" x="-4"
y="-2" y="0"
color="255 255 255 255" color="255 255 255 255"
shadow="true" shadow="true"
fontsize="12" fontsize="12"
@ -223,7 +223,7 @@
<view type="text" <view type="text"
id="t" id="t"
posref="TL TL" posref="TL TL"
y="-1" y="0"
color="255 255 255 255" color="255 255 255 255"
fontsize="12" fontsize="12"
shadow="true" shadow="true"
@ -232,7 +232,7 @@
id="val" id="val"
posref="MR MR" posref="MR MR"
x="-4" x="-4"
y="-2" y="0"
color="255 255 255 255" color="255 255 255 255"
shadow="true" shadow="true"
fontsize="12" fontsize="12"
@ -271,7 +271,7 @@
<view type="text" <view type="text"
id="t" id="t"
posref="TL TL" posref="TL TL"
y="-1" y="0"
color="255 255 255 255" color="255 255 255 255"
fontsize="12" fontsize="12"
shadow="true" shadow="true"
@ -280,7 +280,7 @@
id="val" id="val"
posref="MR MR" posref="MR MR"
x="-4" x="-4"
y="-2" y="0"
color="255 255 255 255" color="255 255 255 255"
shadow="true" shadow="true"
fontsize="12" fontsize="12"
@ -317,7 +317,7 @@
<view type="text" <view type="text"
id="t" id="t"
posref="TL TL" posref="TL TL"
y="-1" y="0"
color="255 255 255 255" color="255 255 255 255"
fontsize="12" fontsize="12"
shadow="true" shadow="true"
@ -326,7 +326,7 @@
id="val" id="val"
posref="MR MR" posref="MR MR"
x="-4" x="-4"
y="-2" y="0"
color="255 255 255 255" color="255 255 255 255"
shadow="true" shadow="true"
fontsize="12" fontsize="12"
@ -362,7 +362,7 @@
<view type="text" <view type="text"
id="t" id="t"
posref="TL TL" posref="TL TL"
y="-1" y="0"
color="255 255 255 255" color="255 255 255 255"
fontsize="12" fontsize="12"
shadow="true" shadow="true"
@ -371,7 +371,7 @@
id="max" id="max"
posref="MR MR" posref="MR MR"
x="-4" x="-4"
y="-1" y="0"
color="255 255 255 255" color="255 255 255 255"
shadow="true" shadow="true"
fontsize="12" fontsize="12"
@ -380,7 +380,7 @@
id="sep" id="sep"
posref="MR MR" posref="MR MR"
x="-20" x="-20"
y="-1" y="0"
color="255 255 255 255" color="255 255 255 255"
shadow="true" shadow="true"
fontsize="12" fontsize="12"
@ -389,7 +389,7 @@
id="val" id="val"
posref="MR MR" posref="MR MR"
x="-37" x="-37"
y="-1" y="0"
color="255 255 255 255" color="255 255 255 255"
shadow="true" shadow="true"
fontsize="12" fontsize="12"
@ -432,7 +432,7 @@
id="val" id="val"
posref="MR MR" posref="MR MR"
x="-4" x="-4"
y="-2" y="0"
color="255 255 255 255" color="255 255 255 255"
shadow="true" shadow="true"
fontsize="12" fontsize="12"
@ -480,7 +480,7 @@
id="t" id="t"
posref="TL TL" posref="TL TL"
x="16" x="16"
y="-3" y="2"
color="255 255 255 255" color="255 255 255 255"
global_color="false" global_color="false"
fontsize="10" fontsize="10"
@ -519,7 +519,7 @@
<view type="text" <view type="text"
id="t" id="t"
posref="TL TL" posref="TL TL"
y="-1" y="0"
color="255 255 255 255" color="255 255 255 255"
fontsize="12" fontsize="12"
shadow="true" shadow="true"
@ -569,12 +569,12 @@
value="-1" /> value="-1" />
<group type="container" <group type="container"
id="info_player_skills" id="info_player_skills"
w="500" w="540"
title="uiSkillsTitle" title="uiSkillsTitle"
global_color="false" global_color="false"
header_color="UI:SAVE:WIN:COLORS:PLA" header_color="UI:SAVE:WIN:COLORS:PLA"
min_w="330" min_w="350"
max_w="500" max_w="540"
min_h="550" min_h="550"
max_h="1600" max_h="1600"
pop_max_h="800" pop_max_h="800"
@ -681,7 +681,7 @@
posparent="basics_skills" posparent="basics_skills"
posref="TL TL" posref="TL TL"
x="0" x="0"
y="-24" y="-10"
hardtext="uiRaceBold" hardtext="uiRaceBold"
shadow="true" shadow="true"
color="255 255 255 255" color="255 255 255 255"
@ -701,7 +701,7 @@
posref="TL TL" posref="TL TL"
sizeref="w" sizeref="w"
h="14" h="14"
y="-48"> y="-30">
<view type="text" <view type="text"
id="guild_title" id="guild_title"
posref="TL TL" posref="TL TL"
@ -719,7 +719,7 @@
shadow="true" shadow="true"
color="255 200 55 255" color="255 200 55 255"
global_color="false" global_color="false"
x="2" x="2"
fontsize="12" fontsize="12"
textid="SERVER:GUILD:NAME" textid="SERVER:GUILD:NAME"
dynamic_string="false" /> dynamic_string="false" />
@ -729,7 +729,7 @@
sizeref="w5" sizeref="w5"
w="-1" w="-1"
h="188" h="188"
y="-72"> y="-52">
<view type="text" <view type="text"
id="Skill_t" id="Skill_t"
posref="TL TL" posref="TL TL"
@ -744,7 +744,7 @@
posref="TL TL" posref="TL TL"
x="0" x="0"
sizeref="w" sizeref="w"
y="-14" y="-16"
w="0" w="0"
h="172" h="172"
inherit_gc_alpha="true"> inherit_gc_alpha="true">
@ -758,46 +758,46 @@
fontsize="10" fontsize="10"
color="255 255 255 255" /> color="255 255 255 255" />
<instance template="tipc_score" <instance template="tipc_score"
id="lif" id="ChaScore1"
posref="TL TL" posref="TL TL"
x="8" x="8"
y="-20" y="-20"
w="-8" w="-8"
tooltip="uittIdentityHP" tooltip="uittIdentityChaScore1"
text="uiHP" text="uiChaScore1"
val="%player_hp" val="%player_ChaScore1"
maxval="%player_hp_max" maxval="%player_ChaScore1_max"
baseval="%player_hp_base" /> baseval="%player_ChaScore1_base" />
<instance template="tipc_score" <instance template="tipc_score"
id="sap" id="ChaScore3"
posparent="lif" posparent="ChaScore1"
posref="BL TL" posref="BL TL"
y="0" y="0"
tooltip="uittIdentitySap" tooltip="uittIdentityChaScore3"
text="uiSap" text="uiChaScore3"
val="%player_sap" val="%player_ChaScore3"
maxval="%player_sap_max" maxval="%player_ChaScore3_max"
baseval="%player_sap_base" /> baseval="%player_ChaScore3_base" />
<instance template="tipc_score" <instance template="tipc_score"
id="sta" id="ChaScore2"
posparent="sap" posparent="ChaScore3"
posref="BL TL" posref="BL TL"
y="0" y="0"
tooltip="uittIdentitySta" tooltip="uittIdentityChaScore2"
text="uiStamina" text="uiChaScore2"
val="%player_sta" val="%player_ChaScore2"
maxval="%player_sta_max" maxval="%player_ChaScore2_max"
baseval="%player_sta_base" /> baseval="%player_ChaScore2_base" />
<instance template="tipc_score" <instance template="tipc_score"
id="foc" id="ChaScore4"
posparent="sta" posparent="ChaScore2"
posref="BL TL" posref="BL TL"
y="0" y="0"
tooltip="uittIdentityFoc" tooltip="uittIdentityChaScore4"
text="uiFocus" text="uiChaScore4"
val="%player_focus" val="%player_ChaScore4"
maxval="%player_focus_max" maxval="%player_ChaScore4_max"
baseval="%player_focus_base" /> baseval="%player_ChaScore4_base" />
<view type="text" <view type="text"
id="Regen" id="Regen"
posref="TL TL" posref="TL TL"
@ -808,42 +808,42 @@
fontsize="10" fontsize="10"
color="255 255 255 255" /> color="255 255 255 255" />
<instance template="tipc_characReg" <instance template="tipc_characReg"
id="hpreg" id="ChaScore1reg"
posref="TL TL" posref="TL TL"
x="8" x="8"
y="-105" y="-105"
w="-8" w="-8"
text="uiHP" text="uiChaScore1"
val="%player_hpreg" val="%player_ChaScore1reg"
baseval="%player_hpreg_base" baseval="%player_ChaScore1reg_base"
tooltip="uittIdentityHPReg" /> tooltip="uittIdentityChaScore1Reg" />
<instance template="tipc_characReg" <instance template="tipc_characReg"
id="sapreg" id="ChaScore3reg"
posparent="hpreg" posparent="ChaScore1reg"
posref="BL TL" posref="BL TL"
y="0" y="0"
text="uiSap" text="uiChaScore3"
val="%player_sapreg" val="%player_ChaScore3reg"
baseval="%player_sapreg_base" baseval="%player_ChaScore3reg_base"
tooltip="uittIdentitySapReg" /> tooltip="uittIdentityChaScore3Reg" />
<instance template="tipc_characReg" <instance template="tipc_characReg"
id="stareg" id="ChaScore2reg"
posparent="sapreg" posparent="ChaScore3reg"
posref="BL TL" posref="BL TL"
y="0" y="0"
text="uiStamina" text="uiChaScore2"
val="%player_stareg" val="%player_ChaScore2reg"
baseval="%player_stareg_base" baseval="%player_ChaScore2reg_base"
tooltip="uittIdentityStaReg" /> tooltip="uittIdentityChaScore2Reg" />
<instance template="tipc_characReg" <instance template="tipc_characReg"
id="focreg" id="ChaScore4reg"
posparent="stareg" posparent="ChaScore2reg"
posref="BL TL" posref="BL TL"
y="0" y="0"
text="uiFocus" text="uiChaScore4"
val="%player_focreg" val="%player_ChaScore4reg"
baseval="%player_focreg_base" baseval="%player_ChaScore4reg_base"
tooltip="uittIdentityFocReg" /> tooltip="uittIdentityChaScore4Reg" />
</group> </group>
<instance template="inner_thin_border" <instance template="inner_thin_border"
posparent="black" posparent="black"
@ -855,7 +855,7 @@
w="-1" w="-1"
x="1" x="1"
h="188" h="188"
y="-72"> y="-52">
<view type="text" <view type="text"
id="Skill_t" id="Skill_t"
posref="TL TL" posref="TL TL"
@ -870,76 +870,76 @@
posref="TL TL" posref="TL TL"
x="0" x="0"
sizeref="w" sizeref="w"
y="-14" y="-16"
w="0" w="0"
h="172" h="172"
inherit_gc_alpha="true"> inherit_gc_alpha="true">
<instance template="tipc_charac" <instance template="tipc_charac"
id="hpmax" id="ChaScore1max"
posref="TL TL" posref="TL TL"
x="8" x="8"
y="-20" y="-20"
w="-8" w="-8"
text="uiCarac_HpMax" text="uiCarac_ChaScore1Max"
val="%player_carac_hpmax" val="%player_carac_ChaScore1max"
tooltip="uittIdentityCons" /> tooltip="uittIdentityCha1" />
<instance template="tipc_charac" <instance template="tipc_charac"
id="sapmax" id="ChaScore3max"
posparent="hpmax" posparent="ChaScore1max"
posref="BL TL" posref="BL TL"
y="0" y="0"
text="uiCarac_SapMax" text="uiCarac_ChaScore3Max"
val="%player_carac_sapmax" val="%player_carac_ChaScore3max"
tooltip="uittIdentityInt" /> tooltip="uittIdentityCha3" />
<instance template="tipc_charac" <instance template="tipc_charac"
id="stamax" id="ChaScore2max"
posparent="sapmax" posparent="ChaScore3max"
posref="BL TL" posref="BL TL"
y="0" y="0"
text="uiCarac_StaMax" text="uiCarac_ChaScore2Max"
val="%player_carac_stamax" val="%player_carac_ChaScore2max"
tooltip="uittIdentityStr" /> tooltip="uittIdentityCha2" />
<instance template="tipc_charac" <instance template="tipc_charac"
id="focmax" id="ChaScore4max"
posparent="stamax" posparent="ChaScore2max"
posref="BL TL" posref="BL TL"
y="0" y="0"
text="uiCarac_WishMax" text="uiCarac_ChaScore4Max"
val="%player_carac_wishmax" val="%player_carac_ChaScore4max"
tooltip="uittIdentityDex" /> tooltip="uittIdentityCha4" />
<instance template="tipc_charac" <instance template="tipc_charac"
id="hpreg" id="ChaScore1reg"
posref="TL TL" posref="TL TL"
x="8" x="8"
y="-105" y="-105"
w="-8" w="-8"
text="uiCarac_HpReg" text="uiCarac_ChaScore1Reg"
val="%player_carac_hpreg" val="%player_carac_ChaScore1reg"
tooltip="uittIdentityMeta" /> tooltip="uittIdentityCha1Reg" />
<instance template="tipc_charac" <instance template="tipc_charac"
id="sapreg" id="ChaScore3reg"
posparent="hpreg" posparent="ChaScore1reg"
posref="BL TL" posref="BL TL"
y="0" y="0"
text="uiCarac_SapReg" text="uiCarac_ChaScore3Reg"
val="%player_carac_sapreg" val="%player_carac_ChaScore3reg"
tooltip="uittIdentityWis" /> tooltip="uittIdentityCha3Reg" />
<instance template="tipc_charac" <instance template="tipc_charac"
id="stareg" id="ChaScore2reg"
posparent="sapreg" posparent="ChaScore3reg"
posref="BL TL" posref="BL TL"
y="0" y="0"
text="uiCarac_StaReg" text="uiCarac_ChaScore2Reg"
val="%player_carac_stareg" val="%player_carac_stareg"
tooltip="uittIdentityWB" /> tooltip="uittIdentityCha2Reg" />
<instance template="tipc_charac" <instance template="tipc_charac"
id="focreg" id="ChaScore4reg"
posparent="stareg" posparent="ChaScore2reg"
posref="BL TL" posref="BL TL"
y="0" y="0"
text="uiCarac_WishReg" text="uiCarac_ChaScore4Reg"
val="%player_carac_wishreg" val="%player_carac_ChaScore4reg"
tooltip="uittIdentityWill" /> tooltip="uittIdentityCha4Reg" />
</group> </group>
<instance template="inner_thin_border" <instance template="inner_thin_border"
posparent="black" posparent="black"
@ -950,7 +950,7 @@
sizeref="w5" sizeref="w5"
w="-1" w="-1"
h="83" h="83"
y="-264"> y="-248">
<view type="text" <view type="text"
id="sp" id="sp"
posref="TL TL" posref="TL TL"
@ -965,7 +965,7 @@
posref="TL TL" posref="TL TL"
x="0" x="0"
sizeref="w" sizeref="w"
y="-14" y="-16"
w="0" w="0"
h="67" h="67"
inherit_gc_alpha="true"> inherit_gc_alpha="true">
@ -1024,7 +1024,7 @@
w="-1" w="-1"
x="1" x="1"
h="83" h="83"
y="-264"> y="-248">
<view type="text" <view type="text"
id="cm" id="cm"
posref="TL TL" posref="TL TL"
@ -1039,7 +1039,7 @@
posref="TL TL" posref="TL TL"
x="0" x="0"
sizeref="w" sizeref="w"
y="-14" y="-16"
w="0" w="0"
h="67" h="67"
inherit_gc_alpha="true"> inherit_gc_alpha="true">
@ -1110,8 +1110,8 @@
posref="TL TL" posref="TL TL"
sizeref="w5" sizeref="w5"
w="-1" w="-1"
h="155" h="157"
y="-347"> y="-338">
<view type="text" <view type="text"
id="resists_t" id="resists_t"
posref="TL TL" posref="TL TL"
@ -1129,15 +1129,15 @@
posref="TL TL" posref="TL TL"
x="0" x="0"
sizeref="w" sizeref="w"
y="-14" y="-16"
w="0" w="0"
h="141" h="140"
inherit_gc_alpha="true"> inherit_gc_alpha="true">
<instance template="tipc_magic_resist" <instance template="tipc_magic_resist"
id="Desert" id="Desert"
posref="TL TL" posref="TL TL"
x="8" x="8"
y="-10" y="-8"
w="-8" w="-8"
val="%player_resist_desert" /> val="%player_resist_desert" />
<instance template="tipc_magic_resist" <instance template="tipc_magic_resist"
@ -1173,8 +1173,8 @@
posref="TM TL" posref="TM TL"
sizeref="w5" sizeref="w5"
w="-1" w="-1"
h="155" h="158"
y="-347"> y="-337">
<view type="text" <view type="text"
id="protections_t" id="protections_t"
posref="TL TL" posref="TL TL"
@ -1192,15 +1192,15 @@
posref="TL TL" posref="TL TL"
x="0" x="0"
sizeref="w" sizeref="w"
y="-14" y="-16"
w="0" w="0"
h="141" h="140"
inherit_gc_alpha="true"> inherit_gc_alpha="true">
<instance template="tipc_magic_protect" <instance template="tipc_magic_protect"
id="Acid" id="Acid"
posref="TL TL" posref="TL TL"
x="8" x="8"
y="-10" y="-8"
w="-8" w="-8"
val="%player_protect_acid" /> val="%player_protect_acid" />
<instance template="tipc_magic_protect" <instance template="tipc_magic_protect"
@ -1256,8 +1256,8 @@
posref="TL TL" posref="TL TL"
sizeref="w5" sizeref="w5"
w="-1" w="-1"
h="40" h="42"
y="-510"> y="-500">
<view type="text" <view type="text"
id="defense_t" id="defense_t"
posref="TL TL" posref="TL TL"
@ -1272,15 +1272,15 @@
posref="TL TL" posref="TL TL"
x="0" x="0"
sizeref="w" sizeref="w"
y="-14" y="-16"
w="0" w="0"
h="26" h="24"
inherit_gc_alpha="true"> inherit_gc_alpha="true">
<instance template="tipc_scoreEP" <instance template="tipc_scoreEP"
id="dodge" id="dodge"
posref="TL TL" posref="TL TL"
x="8" x="8"
y="-7" y="-5"
w="-8" w="-8"
text="uiDodge" text="uiDodge"
val="%player_dodge_current" val="%player_dodge_current"
@ -1298,21 +1298,21 @@
posref="TM TL" posref="TM TL"
sizeref="w5" sizeref="w5"
w="-1" w="-1"
h="40" h="42"
y="-510"> y="-500">
<group id="black" <group id="black"
posref="TL TL" posref="TL TL"
x="0" x="0"
sizeref="w" sizeref="w"
y="-14" y="-16"
w="0" w="0"
h="26" h="24"
inherit_gc_alpha="true"> inherit_gc_alpha="true">
<instance template="tipc_scoreEP" <instance template="tipc_scoreEP"
id="parry" id="parry"
posref="TL TL" posref="TL TL"
x="8" x="8"
y="-7" y="-5"
w="-8" w="-8"
text="uiParry" text="uiParry"
val="%player_parry_current" val="%player_parry_current"
@ -1403,7 +1403,7 @@
x="0" x="0"
y="-10" /> y="-10" />
<group id="pvp_points" <group id="pvp_points"
posparent="fp" posparent="fp"
posref="BL TL" posref="BL TL"
sizeref="wh" sizeref="wh"
w="-1" w="-1"
@ -1423,7 +1423,7 @@
posref="TL TL" posref="TL TL"
x="0" x="0"
sizeref="w" sizeref="w"
y="-14" y="-16"
w="0" w="0"
h="26" h="26"
inherit_gc_alpha="true"> inherit_gc_alpha="true">
@ -1453,8 +1453,8 @@
inherit_gc_alpha="true" /> inherit_gc_alpha="true" />
</group> </group>
</group> </group>
<group h="0" id="rpjobs" posref="TL TL" sizeref="wh" w="0" y="0"> <group h="0" id="rpjobs" posref="TL TL" sizeref="wh" w="0" y="0">
<ctrl style="text_button_header" <ctrl style="text_button_header"
button_type="push_button" button_type="push_button"
id="browse_home" id="browse_home"
posref="TR TR" posref="TR TR"
@ -1464,11 +1464,10 @@
tooltip="uittBrowseRefresh" tooltip="uittBrowseRefresh"
onclick_l="browse_home" onclick_l="browse_home"
params_l="name=ui:interface:info_player_skills:content:rpjobs:html" /> params_l="name=ui:interface:info_player_skills:content:rpjobs:html" />
<group type="webig_html"
<group type="webig_html"
id="html" id="html"
posref="TL TL" posref="TL TL"
url="http://app.khaganat.net/" url="http://app.ryzom.com/app_rpjobs/index.php"
title_prefix="" title_prefix=""
sizeref="wh" sizeref="wh"
x="0" x="0"
@ -1503,7 +1502,7 @@
checkbox_bitmap_pushed="w_opacity_on.tga" checkbox_bitmap_pushed="w_opacity_on.tga"
checkbox_bitmap_over="" checkbox_bitmap_over=""
background_bitmap_view="black2" background_bitmap_view="black2"
home="http://app.khaganat.net/" home="http://app.ryzom.com/app_rpjobs/index.php"
browse_next_time="true" browse_next_time="true"
form_text_area_group="edit_box_widget_multiline"> form_text_area_group="edit_box_widget_multiline">
<group id="black" <group id="black"
@ -1583,28 +1582,27 @@
posref="TR TR" posref="TR TR"
active="true" active="true"
y="-9" y="-9"
wmargin="8" wmargin="8"
hardtext="uiInfo" hardtext="uiInfo"
tooltip="uittIdentityInfo" tooltip="uittIdentityInfo"
onclick_l="open_title_help" onclick_l="open_title_help"
params_l="from=user" /> params_l="from=user" />
<ctrl style="text_button_header" <ctrl style="text_button_header"
button_type="push_button" button_type="push_button"
id="browse_home" id="browse_home"
posref="BR TR" posref="BR TR"
posparent="title" posparent="title"
x="0" x="0"
y="-2" y="-2"
hardtext="uiBrowseRefresh" hardtext="uiBrowseRefresh"
tooltip="uittBrowseRefresh" tooltip="uittBrowseRefresh"
onclick_l="browse_home" onclick_l="browse_home"
params_l="name=ui:interface:info_player_skills:content:webinfos:html" /> params_l="name=ui:interface:info_player_skills:content:webinfos:html" />
<group type="webig_html"
<group type="webig_html"
id="html" id="html"
posref="TL TL" posref="TL TL"
posparent="parent" posparent="parent"
url="http://app.khaganat.net/" url="http://app.ryzom.com/app_profile/index.php"
title_prefix="" title_prefix=""
sizeref="wh" sizeref="wh"
x="0" x="0"
@ -1639,7 +1637,7 @@
checkbox_bitmap_pushed="w_opacity_on.tga" checkbox_bitmap_pushed="w_opacity_on.tga"
checkbox_bitmap_over="" checkbox_bitmap_over=""
background_bitmap_view="black2" background_bitmap_view="black2"
home="http://app.khaganat.net/" home="http://app.ryzom.com/app_profile/index.php"
browse_next_time="true" browse_next_time="true"
form_text_area_group="edit_box_widget_multiline"> form_text_area_group="edit_box_widget_multiline">
<group id="black" <group id="black"
@ -3776,7 +3774,7 @@
y="0" y="0"
posref="ML MR" posref="ML MR"
posparent="browse_undo" posparent="browse_undo"
text_y="-2" text_y="0"
onclick_l="lua" onclick_l="lua"
params_l="game.RingAccessPointFilter:open()" params_l="game.RingAccessPointFilter:open()"
hardtext="uiRingAccessPointFilter" hardtext="uiRingAccessPointFilter"
@ -3788,7 +3786,7 @@
y="0" y="0"
posref="ML MR" posref="ML MR"
posparent="browse_filter" posparent="browse_filter"
text_y="-2" text_y="0"
onclick_l="lua" onclick_l="lua"
params_l="game.RingAccessPointFilter:validate()" params_l="game.RingAccessPointFilter:validate()"
hardtext="uiBotChatRefresh" hardtext="uiBotChatRefresh"

28
data/kh/kh_server/database.xml
View file

@ -173,13 +173,13 @@
<!-- NB a UID invalid doesn't mean no target. It may be a Forage source --> <!-- NB a UID invalid doesn't mean no target. It may be a Forage source -->
<leaf name="UID" <leaf name="UID"
type="I20" /> type="I20" />
<leaf name="HP" <leaf name="ChaScore1"
type="S8" /> type="S8" />
<leaf name="SAP" <leaf name="ChaScore3"
type="I7" /> type="I7" />
<leaf name="STA" <leaf name="ChaScore2"
type="I7" /> type="I7" />
<leaf name="FOCUS" <leaf name="ChaScore4"
type="I7" /> type="I7" />
<leaf name="PLAYER_LEVEL" <leaf name="PLAYER_LEVEL"
type="I8" /> type="I8" />
@ -253,11 +253,11 @@
<!-- Entity Unique Identifier --> <!-- Entity Unique Identifier -->
<leaf name="NAME" <leaf name="NAME"
type="I32" /> type="I32" />
<leaf name="HP" <leaf name="ChaScore1"
type="S8" /> type="S8" />
<leaf name="SAP" <leaf name="ChaScore3"
type="I7" /> type="I7" />
<leaf name="STA" <leaf name="ChaScore2"
type="I7" /> type="I7" />
<leaf name="POS" <leaf name="POS"
type="I64" /> type="I64" />
@ -1025,21 +1025,21 @@
<leaf name="COUNTER" <leaf name="COUNTER"
type="I4" /> type="I4" />
<!-- The cost each second --> <!-- The cost each second -->
<leaf name="HP_COST" <leaf name="ChaScore1_COST"
type="I16" /> type="I16" />
<leaf name="SAP_COST" <leaf name="ChaScore3_COST"
type="I16" /> type="I16" />
<leaf name="STA_COST" <leaf name="ChaScore2_COST"
type="I16" /> type="I16" />
<!-- Entity name --> <!-- Entity name -->
<leaf name="TARGET_NAME" <leaf name="TARGET_NAME"
type="TEXT" /> type="TEXT" />
<!-- Entity State --> <!-- Entity State -->
<leaf name="TARGET_HP" <leaf name="TARGET_ChaScore1"
type="I7" /> type="I7" />
<leaf name="TARGET_SAP" <leaf name="TARGET_ChaScore3"
type="I7" /> type="I7" />
<leaf name="TARGET_STA" <leaf name="TARGET_ChaScore2"
type="I7" /> type="I7" />
</branch> </branch>
</branch> </branch>
@ -1512,6 +1512,8 @@
type="I5" /> type="I5" />
<leaf name="DESPAWN" <leaf name="DESPAWN"
type="I7" /> type="I7" />
<leaf name="NAME"
type="I32" />
</branch> </branch>
</branch> </branch>
<branch name="DEBUG_INFO" <branch name="DEBUG_INFO"