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

ajout chascore

Browse source
This commit is contained in:
deed 2016-09-13 23:22:11 +02:00
parent ed6536f9a0
commit 9490463b36
10 changed files with 54 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/kh/aaa_lirria/config.xml
View file

@ -2137,14 +2137,14 @@ This MUST follow the Enum MISSION_DESC::TIconId
<define id="player_sta_base" <define id="player_sta_base"
value="SERVER:CHARACTER_INFO:SCORES1:Base" /> value="SERVER:CHARACTER_INFO:SCORES1:Base" />
<define id="player_sap" <define id="player_sap"
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_sap_max"
value="SERVER:CHARACTER_INFO:SCORES2:Max" /> value="SERVER:CHARACTER_INFO:SCORES2:Max" />
<define id="player_sap_base" <define id="player_sap_base"
value="SERVER:CHARACTER_INFO:SCORES2:Base" /> value="SERVER:CHARACTER_INFO:SCORES2:Base" />
<define id="player_focus" <define id="player_focus"
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_focus_max"
value="SERVER:CHARACTER_INFO:SCORES3:Max" /> value="SERVER:CHARACTER_INFO:SCORES3:Max" />

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

2
data/ryz/ryz_zzz_bazaar/interaction.xml → data/kh/aaa_lirria/interaction.xml
View file

@ -373,7 +373,7 @@
posref="TL TL" posref="TL TL"
color="214 56 7 255" color="214 56 7 255"
text="uiHP" text="uiHP"
val="%target_hp" /> val="%target_ChaScore1" />
<instance template="text_tt" <instance template="text_tt"
posparent="jlife" posparent="jlife"
tooltip="uittTargetHp" tooltip="uittTargetHp"

6
data/ryz/ryz_zzz_bazaar/phrase.xml → data/kh/aaa_lirria/phrase.xml
View file

@ -738,11 +738,11 @@
--> -->
<instance template="box_widget" id="box_cost" posref="BL BL" w="81" h="13" /> <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:ChaScore1_COST" color="%hp_color" global_color="false" /> <view type="text_number" id="ChaScore1_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" 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:ChaScore3_COST" color="%sap_color" global_color="false" /> <view type="text_number" id="ChaScore3_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" 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:ChaScore2_COST" color="%sta_color" global_color="false" /> <view type="text_number" id="ChaScore2_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> </group>
<link expr="eq(@UI:VARIABLES:LINKS_INFOS, 0)" target="name_cost:active" /> <link expr="eq(@UI:VARIABLES:LINKS_INFOS, 0)" target="name_cost:active" />

66
data/ryz/ryz_zzz_bazaar/player.lua → data/kh/aaa_lirria/player.lua
View file

@ -47,57 +47,57 @@ 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) -- 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() function game:updatePlayerBars()
local dispSap = getDbProp('UI:SAVE:PLAYER:DISP_ChaScore3'); local dispChaScore3 = getDbProp('UI:SAVE:PLAYER:DISP_ChaScore3');
local dispSta = getDbProp('UI:SAVE:PLAYER:DISP_ChaScore2'); local dispChaScore2 = getDbProp('UI:SAVE:PLAYER:DISP_ChaScore2');
local dispFoc = getDbProp('UI:SAVE:PLAYER:DISP_ChaScore4'); local dispChaScore4 = getDbProp('UI:SAVE:PLAYER:DISP_ChaScore4');
local ui = getUI('ui:interface:player:content'); local ui = getUI('ui:interface:player:content');
-- active ui in function of what is displayed -- active ui in function of what is displayed
ui.b_sap.active = (dispSap == 1); ui.b_ChaScore3.active = (dispChaScore3 == 1);
ui.jsap.active = (dispSap == 1); ui.jChaScore3.active = (dispChaScore3 == 1);
ui.b_sta.active = (dispSta == 1); ui.b_ChaScore2.active = (dispChaScore2 == 1);
ui.jsta.active = (dispSta == 1); ui.jChaScore2.active = (dispChaScore2 == 1);
ui.b_foc.active = (dispFoc == 1); ui.b_ChaScore4.active = (dispChaScore4 == 1);
ui.jfoc.active = (dispFoc == 1); ui.jChaScore4.active = (dispChaScore4 == 1);
-- choose good y-position -- choose good y-position
local totalBarDisp = dispSap + dispSta + dispFoc; local totalBarDisp = dispSap + dispSta + dispFoc;
if (totalBarDisp == 3) then if (totalBarDisp == 3) then
ui.b_sap.y = -20; ui.b_ChaScore3.y = -20;
ui.b_sta.y = -35; ui.b_ChaScore2.y = -35;
ui.b_foc.y = -50; ui.b_ChaScore4.y = -50;
ui.current_action.y = -65; ui.current_action.y = -65;
elseif (totalBarDisp == 2) then elseif (totalBarDisp == 2) then
if (dispSap == 0) then if (dispChaScore3 == 0) then
ui.b_sta.y = -20; ui.b_ChaScore2.y = -20;
ui.b_ChaScore4.y = -35;
end
if (dispChaScore2 == 0) then
ui.b_ChaScore3.y = -20;
ui.b_foc.y = -35; ui.b_foc.y = -35;
end end
if (dispSta == 0) then if (dispChaScore4 == 0) then
ui.b_sap.y = -20; ui.b_ChaScore3.y = -20;
ui.b_foc.y = -35; ui.b_ChaScore2.y = -35;
end
if (dispFoc == 0) then
ui.b_sap.y = -20;
ui.b_sta.y = -35;
end end
ui.current_action.y = -50; ui.current_action.y = -50;
elseif (totalBarDisp == 1) then elseif (totalBarDisp == 1) then
ui.b_sta.y = -20; ui.b_ChaScore2.y = -20;
ui.b_foc.y = -20; ui.b_ChaScore4.y = -20;
ui.b_sta.y = -20; ui.b_ChaScore2.y = -20;
ui.current_action.y = -35; ui.current_action.y = -35;
@ -864,10 +864,10 @@ function game:updatePhraseTooltip(phrase)
text = concatUCString(text, "@{CCCF}") text = concatUCString(text, "@{CCCF}")
end end
-- IMPORTANT : the following getters on 'phrase' take in account the 'total action malus' for the timebeing -- IMPORTANT : the following getters on 'phrase' take in account the 'total action malus' for the timebeing
self:setPhraseTooltipCarac(ttWin, "hp_cost", phrase:getHpCost()) self:setPhraseTooltipCarac(ttWin, "ChaScore1_cost", phrase:getChaScore1Cost())
self:setPhraseTooltipCarac(ttWin, "sta_cost", phrase:getStaCost()) self:setPhraseTooltipCarac(ttWin, "ChaScore3_cost", phrase:getChaScore3Cost())
self:setPhraseTooltipCarac(ttWin, "sap_cost", phrase:getSapCost()) self:setPhraseTooltipCarac(ttWin, "ChaScore2_cost", phrase:getChaScore2Cost())
self:setPhraseTooltipCarac(ttWin, "focus_cost", phrase:getFocusCost()) self:setPhraseTooltipCarac(ttWin, "ChaScore4_cost", phrase:getChascore4Cost())
self:setPhraseTooltipCarac(ttWin, "cast_time", phrase:getCastTime(), concatUCString(string.format("%.1f", phrase:getCastTime()), i18n.get("uittSeconds"))) self:setPhraseTooltipCarac(ttWin, "cast_time", phrase:getCastTime(), concatUCString(string.format("%.1f", phrase:getCastTime()), i18n.get("uittSeconds")))
local castRange = phrase:getCastRange() local castRange = phrase:getCastRange()
if not phrase:isMagicPhrase() then if not phrase:isMagicPhrase() then
@ -935,10 +935,10 @@ function game:updateBuffItemTooltip(buffItem)
local ttWin = getUI("ui:interface:buff_item_context_help") local ttWin = getUI("ui:interface:buff_item_context_help")
local text = buffItem:getName() local text = buffItem:getName()
self:setPhraseTooltipCarac(ttWin, "hp_buff", buffItem:getHpBuff()) self:setPhraseTooltipCarac(ttWin, "ChaScore1_buff", buffItem:getChaScore1Buff())
self:setPhraseTooltipCarac(ttWin, "sta_buff", buffItem:getStaBuff()) self:setPhraseTooltipCarac(ttWin, "ChaScore2_buff", buffItem:getChaScore2Buff())
self:setPhraseTooltipCarac(ttWin, "sap_buff", buffItem:getSapBuff()) self:setPhraseTooltipCarac(ttWin, "ChaScore3_buff", buffItem:getChaScore3Buff())
self:setPhraseTooltipCarac(ttWin, "focus_buff", buffItem:getFocusBuff()) self:setPhraseTooltipCarac(ttWin, "ChaScore4_buff", buffItem:getChaScore4Buff())
updateTooltipCoords() updateTooltipCoords()
return text return text

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

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

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

@ -2042,7 +2042,7 @@
x="0" x="0"
y="-4" /> y="-4" />
<instance template="tgcw_checkbox" <instance template="tgcw_checkbox"
id="is_user_hp" id="is_user_ChaScore1"
text="uiHP" text="uiHP"
tooltip="uittHP" tooltip="uittHP"
posref="BL TL" posref="BL TL"
@ -2054,7 +2054,7 @@
text="uiSAP" text="uiSAP"
tooltip="uittSAP" tooltip="uittSAP"
posref="BL TL" posref="BL TL"
posparent="is_user_hp" posparent="is_user_ChaScore1"
x="0" x="0"
y="-4" /> y="-4" />
<instance template="tgcw_checkbox" <instance template="tgcw_checkbox"
@ -2159,7 +2159,7 @@
x="0" x="0"
y="-4" /> y="-4" />
<instance template="tgcw_checkbox" <instance template="tgcw_checkbox"
id="is_friend_hp" id="is_friend_ChaScore1"
text="uiHP" text="uiHP"
tooltip="uittHP" tooltip="uittHP"
posref="BL TL" posref="BL TL"
@ -2171,7 +2171,7 @@
text="uiSAP" text="uiSAP"
tooltip="uittSTA" tooltip="uittSTA"
posref="BL TL" posref="BL TL"
posparent="is_friend_hp" posparent="is_friend_ChaScore1"
x="0" x="0"
y="-4" /> y="-4" />
<instance template="tgcw_checkbox" <instance template="tgcw_checkbox"
@ -2300,7 +2300,7 @@
x="0" x="0"
y="-4" /> y="-4" />
<instance template="tgcw_checkbox" <instance template="tgcw_checkbox"
id="is_enemy_hp" id="is_enemy_ChaScore1"
text="uiHP" text="uiHP"
tooltip="uittHP" tooltip="uittHP"
posref="BL TL" posref="BL TL"
@ -2312,7 +2312,7 @@
text="uiPvpLogo" text="uiPvpLogo"
tooltip="uittPvpLogo" tooltip="uittPvpLogo"
posref="BL TL" posref="BL TL"
posparent="is_enemy_hp" posparent="is_enemy_ChaScore1"
x="0" x="0"
y="-4" /> y="-4" />
</group> </group>
@ -3548,7 +3548,7 @@
widget="boolbut" widget="boolbut"
link="UI:SAVE:INSCENE:USER:GUILD_NAME" link="UI:SAVE:INSCENE:USER:GUILD_NAME"
realtime="true" /> realtime="true" />
<param ui="in_scene_user:is_user_hp:c" <param ui="in_scene_user:is_user_ChaScore1:c"
type="db" type="db"
widget="boolbut" widget="boolbut"
link="UI:SAVE:INSCENE:USER:ChaScore1" link="UI:SAVE:INSCENE:USER:ChaScore1"
@ -3603,7 +3603,7 @@
widget="boolbut" widget="boolbut"
link="UI:SAVE:INSCENE:FRIEND:GUILD_NAME" link="UI:SAVE:INSCENE:FRIEND:GUILD_NAME"
realtime="true" /> realtime="true" />
<param ui="in_scene_friend:is_friend_hp:c" <param ui="in_scene_friend:is_friend_ChaScore1:c"
type="db" type="db"
widget="boolbut" widget="boolbut"
link="UI:SAVE:INSCENE:FRIEND:ChaScore1" link="UI:SAVE:INSCENE:FRIEND:ChaScore1"
@ -3673,10 +3673,10 @@
widget="boolbut" widget="boolbut"
link="UI:SAVE:INSCENE:ENEMY:GUILD_NAME" link="UI:SAVE:INSCENE:ENEMY:GUILD_NAME"
realtime="true" /> realtime="true" />
<param ui="in_scene_enemy:is_enemy_hp:c" <param ui="in_scene_enemy:is_enemy_ChaScore1:c"
type="db" type="db"
widget="boolbut" widget="boolbut"
link="UI:SAVE:INSCENE:ENEMY:HP" link="UI:SAVE:INSCENE:ENEMY:ChaScore1"
realtime="true" /> realtime="true" />
<param ui="in_scene_enemy:is_ennemy_pvp_logo:c" <param ui="in_scene_enemy:is_ennemy_pvp_logo:c"
type="db" type="db"

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

@ -1467,7 +1467,7 @@
<group type="webig_html" <group type="webig_html"
id="html" id="html"
posref="TL TL" posref="TL TL"
url="http://app.ryzom.com/app_rpjobs/index.php" url="http://app.khaganat.net"
title_prefix="" title_prefix=""
sizeref="wh" sizeref="wh"
x="0" x="0"
@ -1502,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.ryzom.com/app_rpjobs/index.php" home="http://app.khaganat.net"
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"
@ -1602,7 +1602,7 @@
id="html" id="html"
posref="TL TL" posref="TL TL"
posparent="parent" posparent="parent"
url="http://app.ryzom.com/app_profile/index.php" url="http://app.khaganat.net"
title_prefix="" title_prefix=""
sizeref="wh" sizeref="wh"
x="0" x="0"
@ -1637,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.ryzom.com/app_profile/index.php" home="http://app.khaganat.net"
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"

2
data/kh/kh_server/msg.xml
View file

@ -173,7 +173,7 @@
sendto="EGS" sendto="EGS"
format="u8" format="u8"
description="the client select a new slot to defend (or none)" /> description="the client select a new slot to defend (or none)" />
<leaf name="FLYING_HP_DELTA" <leaf name="FLYING_ChaScore1_DELTA"
description="add a flying text to an entity (u32 entity, u32 rgba, s16 delta)" /> description="add a flying text to an entity (u32 entity, u32 rgba, s16 delta)" />
<leaf name="FLYING_TEXT_ISE" <leaf name="FLYING_TEXT_ISE"
description="add a flying text to an entity (u32 entity, u32 rgba, u8 effect, s32 param)" /> description="add a flying text to an entity (u32 entity, u32 rgba, u8 effect, s32 param)" />