ajout ChaScore

This commit is contained in:
deed 2016-09-13 16:07:55 +02:00
parent cb3348151e
commit ed6536f9a0
7 changed files with 40 additions and 40 deletions

View file

@ -2130,7 +2130,7 @@ This MUST follow the Enum MISSION_DESC::TIconId
<define id="player_hp_base"
value="SERVER:CHARACTER_INFO:SCORES0:Base" />
<define id="player_sta"
value="UI:VARIABLES:USER:STA" />
value="UI:VARIABLES:USER:ChaScore2" />
<!-- Local because sent by impulse -->
<define id="player_sta_max"
value="SERVER:CHARACTER_INFO:SCORES1:Max" />

View file

@ -3551,22 +3551,22 @@
<param ui="in_scene_user:is_user_hp:c"
type="db"
widget="boolbut"
link="UI:SAVE:INSCENE:USER:HP"
link="UI:SAVE:INSCENE:USER:ChaScore1"
realtime="true" />
<param ui="in_scene_user:is_user_sap:c"
type="db"
widget="boolbut"
link="UI:SAVE:INSCENE:USER:SAP"
link="UI:SAVE:INSCENE:USER:ChaScore3"
realtime="true" />
<param ui="in_scene_user:is_user_sta:c"
type="db"
widget="boolbut"
link="UI:SAVE:INSCENE:USER:STA"
link="UI:SAVE:INSCENE:USER:ChaScore2"
realtime="true" />
<param ui="in_scene_user:is_user_focus:c"
type="db"
widget="boolbut"
link="UI:SAVE:INSCENE:USER:FOCUS"
link="UI:SAVE:INSCENE:USER:ChaScore4"
realtime="true" />
<param ui="in_scene_user:is_user_action:c"
type="db"
@ -3606,22 +3606,22 @@
<param ui="in_scene_friend:is_friend_hp:c"
type="db"
widget="boolbut"
link="UI:SAVE:INSCENE:FRIEND:HP"
link="UI:SAVE:INSCENE:FRIEND:ChaScore1"
realtime="true" />
<param ui="in_scene_friend:is_friend_sap:c"
type="db"
widget="boolbut"
link="UI:SAVE:INSCENE:FRIEND:SAP"
link="UI:SAVE:INSCENE:FRIEND:ChaScore3"
realtime="true" />
<param ui="in_scene_friend:is_friend_sta:c"
type="db"
widget="boolbut"
link="UI:SAVE:INSCENE:FRIEND:STA"
link="UI:SAVE:INSCENE:FRIEND:ChaScore2"
realtime="true" />
<param ui="in_scene_friend:is_friend_focus:c"
type="db"
widget="boolbut"
link="UI:SAVE:INSCENE:FRIEND:FOCUS"
link="UI:SAVE:INSCENE:FRIEND:ChaScore4"
realtime="true" />
<param ui="in_scene_friend:is_friend_pvp_logo:c"
type="db"

View file

@ -1511,14 +1511,14 @@
mini="true"
x="-16"
color1="%sta_color"
value1="UI:VARIABLES:BARS:TEAM:#team_mate_index:STA"
value1="UI:VARIABLES:BARS:TEAM:#team_mate_index:ChaScore1"
range1="UI:CONST:127"
color2="%sap_color"
value2="UI:VARIABLES:BARS:TEAM:#team_mate_index:SAP"
value2="UI:VARIABLES:BARS:TEAM:#team_mate_index:ChaScore2"
range2="UI:CONST:127"
color3="%hp_color"
color3_negative="%hp_color_neg"
value3="UI:VARIABLES:BARS:TEAM:#team_mate_index:HP"
value3="UI:VARIABLES:BARS:TEAM:#team_mate_index:ChaScore1"
range3="UI:CONST:127" />
<view type="bitmap"
id="lead"

View file

@ -738,11 +738,11 @@
-->
<instance template="box_widget" id="box_cost" posref="BL BL" w="81" h="13" />
<view type="text_number" id="hp_cost" posparent="box_cost" posref="ML MM" x="14" y="-2" fontsize="8" shadow="true" value="SERVER:EXECUTE_PHRASE:LINK:#index:HP_COST" color="%hp_color" global_color="false" />
<view type="text_number" id="hp_cost" posparent="box_cost" posref="ML MM" x="14" y="-2" fontsize="8" shadow="true" value="SERVER:EXECUTE_PHRASE:LINK:#index:ChaScore1_COST" color="%hp_color" global_color="false" />
<view type="text" id="sep1" posparent="box_cost" posref="ML MM" x="27" y="-1" shadow="true" fontsize="10" hardtext="/" color="255 255 255 255" />
<view type="text_number" id="sap_cost" posparent="box_cost" posref="MM MM" x="0" y="-2" fontsize="8" shadow="true" value="SERVER:EXECUTE_PHRASE:LINK:#index:SAP_COST" color="%sap_color" global_color="false" />
<view type="text_number" id="sap_cost" posparent="box_cost" posref="MM MM" x="0" y="-2" fontsize="8" shadow="true" value="SERVER:EXECUTE_PHRASE:LINK:#index:ChaScore3_COST" color="%sap_color" global_color="false" />
<view type="text" id="sep2" posparent="box_cost" posref="ML MM" x="54" y="-1" shadow="true" fontsize="10" hardtext="/" color="255 255 255 255" />
<view type="text_number" id="sta_cost" posparent="box_cost" posref="MR MM" x="-14" y="-2" fontsize="8" shadow="true" value="SERVER:EXECUTE_PHRASE:LINK:#index:STA_COST" color="%sta_color" global_color="false" />
<view type="text_number" id="sta_cost" posparent="box_cost" posref="MR MM" x="-14" y="-2" fontsize="8" shadow="true" value="SERVER:EXECUTE_PHRASE:LINK:#index:ChaScore2_COST" color="%sta_color" global_color="false" />
</group>
<link expr="eq(@UI:VARIABLES:LINKS_INFOS, 0)" target="name_cost:active" />
@ -756,9 +756,9 @@
<view type="text_id" id="name" posref="TL TL" x="0" y="-1" h="10" shadow="true" fontsize="10" textid="SERVER:EXECUTE_PHRASE:LINK:#index:TARGET_NAME" />
<!-- Jauges Target -->
<view type="bar3" id="jauges" posref="BL BL" mini="true" y="1"
color1="%sta_color" value1="SERVER:EXECUTE_PHRASE:LINK:#index:TARGET_STA" range1="UI:CONST:127"
color2="%sap_color" value2="SERVER:EXECUTE_PHRASE:LINK:#index:TARGET_SAP" range2="UI:CONST:127"
color3="%hp_color" value3="SERVER:EXECUTE_PHRASE:LINK:#index:TARGET_HP" range3="UI:CONST:127" />
color1="%sta_color" value1="SERVER:EXECUTE_PHRASE:LINK:#index:TARGET_ChaScore2" range1="UI:CONST:127"
color2="%sap_color" value2="SERVER:EXECUTE_PHRASE:LINK:#index:TARGET_ChaScore3" range2="UI:CONST:127"
color3="%hp_color" value3="SERVER:EXECUTE_PHRASE:LINK:#index:TARGET_ChaScore1" range3="UI:CONST:127" />
</group>
<link expr="ifthenelse(eq(@UI:VARIABLES:LINKS_INFOS, 0), 154, 40)" target="target:x" />

View file

@ -47,9 +47,9 @@ end
-- Update player bars in function of what we wants to display (we can hide each one of the 3 bars : sap,stamina and focus)
function game:updatePlayerBars()
local dispSap = getDbProp('UI:SAVE:PLAYER:DISP_SAP');
local dispSta = getDbProp('UI:SAVE:PLAYER:DISP_STA');
local dispFoc = getDbProp('UI:SAVE:PLAYER:DISP_FOC');
local dispSap = getDbProp('UI:SAVE:PLAYER:DISP_ChaScore3');
local dispSta = getDbProp('UI:SAVE:PLAYER:DISP_ChaScore2');
local dispFoc = getDbProp('UI:SAVE:PLAYER:DISP_ChaScore4');
local ui = getUI('ui:interface:player:content');

View file

@ -199,17 +199,17 @@
<action id="sap_bardisplay"
name="uiSapBarDisplay"
handler="set"
params="dblink=UI:SAVE:PLAYER:DISP_SAP|value=not(@UI:SAVE:PLAYER:DISP_SAP)" />
params="dblink=UI:SAVE:PLAYER:DISP_ChaScore3|value=not(@UI:SAVE:PLAYER:DISP_ChaScore3)" />
<action id="sta_bardisplay"
name="uiStaBarDisplay"
handler="set"
params="dblink=UI:SAVE:PLAYER:DISP_STA|value=not(@UI:SAVE:PLAYER:DISP_STA)" />
params="dblink=UI:SAVE:PLAYER:DISP_ChaScore2|value=not(@UI:SAVE:PLAYER:DISP_ChaScore2)" />
<action id="foc_bardisplay"
name="uiFocBarDisplay"
handler="set"
params="dblink=UI:SAVE:PLAYER:DISP_FOC|value=not(@UI:SAVE:PLAYER:DISP_FOC)" />
params="dblink=UI:SAVE:PLAYER:DISP_ChaScore4|value=not(@UI:SAVE:PLAYER:DISP_ChaScore4)" />
</group>
<link expr="depends(@UI:SAVE:PLAYER:DISP_SAP, @UI:SAVE:PLAYER:DISP_STA, @UI:SAVE:PLAYER:DISP_FOC)"
<link expr="depends(@UI:SAVE:PLAYER:DISP_ChaScore3, @UI:SAVE:PLAYER:DISP_ChaScore2, @UI:SAVE:PLAYER:DISP_ChaScore4)"
action="lua"
params="game:updatePlayerBars()" />
<link expr="depends(@SERVER:CHARACTER_INFO:PVP_FACTION_TAG)"
@ -1126,7 +1126,7 @@
value2="#beast_db_entry:HUNGER"
range2="31"
color3="%hp_color"
value3="#bars_entry:HP"
value3="#bars_entry:ChaScore1"
range3="127" />
<ctrl type="tooltip"
id="tt"

View file

@ -158,10 +158,10 @@
<action handler="set" params="dblink=UI:SAVE:INSCENE:USER:NAME|value=0" />
<action handler="set" params="dblink=UI:SAVE:INSCENE:USER:TITLE|value=0" />
<action handler="set" params="dblink=UI:SAVE:INSCENE:USER:GUILD_NAME|value=0" />
<action handler="set" params="dblink=UI:SAVE:INSCENE:USER:HP|value=0" />
<action handler="set" params="dblink=UI:SAVE:INSCENE:USER:STA|value=0" />
<action handler="set" params="dblink=UI:SAVE:INSCENE:USER:SAP|value=0" />
<action handler="set" params="dblink=UI:SAVE:INSCENE:USER:FOCUS|value=0" />
<action handler="set" params="dblink=UI:SAVE:INSCENE:USER:ChaScore1|value=0" />
<action handler="set" params="dblink=UI:SAVE:INSCENE:USER:ChaScore2|value=0" />
<action handler="set" params="dblink=UI:SAVE:INSCENE:USER:ChaScore3|value=0" />
<action handler="set" params="dblink=UI:SAVE:INSCENE:USER:ChaScore4|value=0" />
<action handler="set" params="dblink=UI:SAVE:INSCENE:USER:ACTION|value=0" />
<action handler="set" params="dblink=UI:SAVE:INSCENE:USER:MESSAGES|value=0" />
<action handler="set" params="dblink=UI:SAVE:INSCENE:USER:PVP_LOGO|value=1" />
@ -169,10 +169,10 @@
<action handler="set" params="dblink=UI:SAVE:INSCENE:FRIEND:NAME|value=1" />
<action handler="set" params="dblink=UI:SAVE:INSCENE:FRIEND:TITLE|value=1" />
<action handler="set" params="dblink=UI:SAVE:INSCENE:FRIEND:GUILD_NAME|value=1" />
<action handler="set" params="dblink=UI:SAVE:INSCENE:FRIEND:HP|value=0" />
<action handler="set" params="dblink=UI:SAVE:INSCENE:FRIEND:STA|value=0" />
<action handler="set" params="dblink=UI:SAVE:INSCENE:FRIEND:SAP|value=0" />
<action handler="set" params="dblink=UI:SAVE:INSCENE:FRIEND:FOCUS|value=0" />
<action handler="set" params="dblink=UI:SAVE:INSCENE:FRIEND:ChaScore1|value=0" />
<action handler="set" params="dblink=UI:SAVE:INSCENE:FRIEND:ChaScore3|value=0" />
<action handler="set" params="dblink=UI:SAVE:INSCENE:FRIEND:ChaScore2|value=0" />
<action handler="set" params="dblink=UI:SAVE:INSCENE:FRIEND:ChaScore4|value=0" />
<action handler="set" params="dblink=UI:SAVE:INSCENE:FRIEND:MESSAGES|value=1" />
<action handler="set" params="dblink=UI:SAVE:INSCENE:FRIEND:PVP_LOGO|value=1" />
<action handler="set" params="dblink=UI:SAVE:INSCENE:FRIEND:NPCNAME|value=1" />
@ -183,7 +183,7 @@
<action handler="set" params="dblink=UI:SAVE:INSCENE:ENEMY:NAME|value=1" />
<action handler="set" params="dblink=UI:SAVE:INSCENE:ENEMY:TITLE|value=1" />
<action handler="set" params="dblink=UI:SAVE:INSCENE:ENEMY:GUILD_NAME|value=1" />
<action handler="set" params="dblink=UI:SAVE:INSCENE:ENEMY:HP|value=1" />
<action handler="set" params="dblink=UI:SAVE:INSCENE:ENEMY:ChaScore1|value=1" />
<action handler="set" params="dblink=UI:SAVE:INSCENE:ENEMY:MESSAGES|value=1" />
<action handler="set" params="dblink=UI:SAVE:INSCENE:ENEMY:PVP_LOGO|value=1" />
@ -233,9 +233,9 @@
<action handler="set" params="dblink=UI:SAVE:NIGHT_COLOR|value=makeRGB(127,190,254)" />
<action handler="set" params="dblink=UI:SAVE:SHOW_3D_ITEM_PREVIEW|value=1" />
<action handler="set" params="dblink=UI:SAVE:PLAYER:DISP_SAP|value=1" />
<action handler="set" params="dblink=UI:SAVE:PLAYER:DISP_STA|value=1" />
<action handler="set" params="dblink=UI:SAVE:PLAYER:DISP_FOC|value=1" />
<action handler="set" params="dblink=UI:SAVE:PLAYER:DISP_ChaScore3|value=1" />
<action handler="set" params="dblink=UI:SAVE:PLAYER:DISP_ChaScore2|value=1" />
<action handler="set" params="dblink=UI:SAVE:PLAYER:DISP_ChaScore4|value=1" />
<action handler="set" params="dblink=UI:SAVE:ACT_BAR_OUT|value=1" />
<action handler="set" params="dblink=UI:SAVE:CHAT:FONT_SIZE|value=10" />