Ryzom
/
ryzom-core
1
1
Fork 0
Code Issues 38 Pull Requests Projects 1 Releases 1 Activity

Changed: Increase MAX_INVENTORY_ANIMAL to 7. Updates of ui files

Browse Source 
--HG--
branch : compatibility-develop
hg/compatibility-develop
ulukyn 7 years ago
parent e17b290367
commit 668d7a556f
4 changed files with 121 additions and 7 deletions
Show Stats Download Patch File Download Diff File

21
code/ryzom/client/data/gamedev/interfaces_v3/config.xml
Unescape Escape View File

@ -2374,6 +2374,12 @@ This MUST follow the Enum MISSION_DESC::TIconId
value="%pa:BEAST2" />
<define id="pa_beast3"
value="%pa:BEAST3" />
<define id="pa_beast4"
value="%pa:BEAST4" />
<define id="pa_beast5"
value="%pa:BEAST5" />
<define id="pa_beast6"
value="%pa:BEAST6" />
<!-- MAX_INVENTORY_ANIMAL -->
<define id="pa_bag0"
value="%set_base:PACK_ANIMAL0" />
@ -2383,6 +2389,12 @@ This MUST follow the Enum MISSION_DESC::TIconId
value="%set_base:PACK_ANIMAL2" />
<define id="pa_bag3"
value="%set_base:PACK_ANIMAL3" />
<define id="pa_bag4"
value="%set_base:PACK_ANIMAL4" />
<define id="pa_bag5"
value="%set_base:PACK_ANIMAL5" />
<define id="pa_bag6"
value="%set_base:PACK_ANIMAL6" />
<define id="money"
value="%set_base:MONEY" />
<define id="skill_points_0"
@ -3053,6 +3065,15 @@ This MUST follow the Enum MISSION_DESC::TIconId
<variable entry="UI:VARIABLES:ISACTIVE:INV_PA3"
type="sint32"
value="0" />
<variable entry="UI:VARIABLES:ISACTIVE:INV_PA4"
type="sint32"
value="0" />
<variable entry="UI:VARIABLES:ISACTIVE:INV_PA5"
type="sint32"
value="0" />
<variable entry="UI:VARIABLES:ISACTIVE:INV_PA6"
type="sint32"
value="0" />
<variable entry="UI:VARIABLES:ISACTIVE:INV_ROOM"
type="sint32"
value="0" />

62
code/ryzom/client/data/gamedev/interfaces_v3/inventory.xml
Unescape Escape View File

@ -643,6 +643,36 @@
<ctrl style="tab_button_new"
id="tab6"
posparent="tab5"
group="content:pa4"
hardtext="uitabInvPAZig1"
tooltip="uiTabInfo"
onclick_r="show"
params_r="inv_pa4"
onclick_l=""
params_l="" />
<ctrl style="tab_button_new"
id="tab7"
posparent="tab6"
group="content:pa5"
hardtext="uitabInvPAZig2"
tooltip="uiTabInfo"
onclick_r="show"
params_r="inv_pa5"
onclick_l=""
params_l="" />
<ctrl style="tab_button_new"
id="tab8"
posparent="tab7"
group="content:pa6"
hardtext="uitabInvPAZig3"
tooltip="uiTabInfo"
onclick_r="show"
params_r="inv_pa6"
onclick_l=""
params_l="" />
<ctrl style="tab_button_new"
id="tab9"
posparent="tab8"
group="content:guild"
hardtext="uitabInvGuild"
tooltip="uiTabInfo"
@ -651,8 +681,8 @@
onclick_l=""
params_l="" />
<ctrl style="tab_button_new"
id="tab7"
posparent="tab6"
id="tab10"
posparent="tab9"
group="content:room"
hardtext="uitabInvRoom"
tooltip="uiTabInfo"
@ -673,6 +703,12 @@
target="tab4:active" />
<link expr="and(not(@UI:VARIABLES:ISACTIVE:INV_PA3), isAnimalStatusPresent(@%pa_beast3:STATUS))"
target="tab5:active" />
<link expr="and(not(@UI:VARIABLES:ISACTIVE:INV_PA4), isAnimalStatusPresent(@%pa_beast4:STATUS))"
target="tab6:active" />
<link expr="and(not(@UI:VARIABLES:ISACTIVE:INV_PA5), isAnimalStatusPresent(@%pa_beast5:STATUS))"
target="tab7:active" />
<link expr="and(not(@UI:VARIABLES:ISACTIVE:INV_PA6), isAnimalStatusPresent(@%pa_beast6:STATUS))"
target="tab8:active" />
<!-- MAX_INVENTORY_ANIMAL -->
<link expr="switch(@%pa_beast0:TYPE, 'uitabInvPAMount0', 'uitabInvPAMount0', 'uitabInvPAPacker0', 'uitabInvPADemon0')"
target="tab2:hardtext" />
@ -683,9 +719,9 @@
<link expr="switch(@%pa_beast3:TYPE, 'uitabInvPAMount3', 'uitabInvPAMount3', 'uitabInvPAPacker3', 'uitabInvPADemon3')"
target="tab5:hardtext" />
<link expr="and(%is_guild_present, not(@UI:SAVE:INVENTORY_GUILD_WANT_POPUP), @UI:TEMP:INVENTORY_GUILD_OPENED)"
target="tab6:active" />
target="tab9:active" />
<link expr="and(not(@UI:VARIABLES:ISACTIVE:INV_ROOM), @UI:TEMP:INVENTORY_ROOM_OPENED)"
target="tab7:active" />
target="tab10:active" />
</group>
<view type="bitmap"
id="sep"
@ -851,6 +887,24 @@
info_entry="%pa_beast3"
bag_entry="%pa_bag3"
icon_db="INV_PA3" />
<!-- pa4 -->
<instance template="tinv_animal"
id="pa4"
info_entry="%pa_beast4"
bag_entry="%pa_bag4"
icon_db="INV_PA4" />
<!-- pa5 -->
<instance template="tinv_animal"
id="pa5"
info_entry="%pa_beast5"
bag_entry="%pa_bag5"
icon_db="INV_PA5" />
<!-- pa6 -->
<instance template="tinv_animal"
id="pa6"
info_entry="%pa_beast6"
bag_entry="%pa_bag6"
icon_db="INV_PA6" />
<!-- guild -->
<group id="guild"
posref="TL TL"

2
code/ryzom/client/data/gamedev/interfaces_v3/local_database.xml
Unescape Escape View File

@ -73,7 +73,7 @@
</branch>
<!-- MAX_INVENTORY_ANIMAL -->
<branch name="PACK_ANIMAL"
count="4">
count="7">
<branch name=""
count="500">
<!-- Common Item Data -->

41
code/ryzom/client/data/gamedev/interfaces_v3/player.xml
Unescape Escape View File

@ -1075,7 +1075,10 @@
<action cond="and(eq(@0,0), or( isAnimalStatusPresent(@%pa_beast0:STATUS),
isAnimalStatusPresent(@%pa_beast1:STATUS),
isAnimalStatusPresent(@%pa_beast2:STATUS),
isAnimalStatusPresent(@%pa_beast3:STATUS) ) )"
isAnimalStatusPresent(@%pa_beast3:STATUS),
isAnimalStatusPresent(@%pa_beast4:STATUS),
isAnimalStatusPresent(@%pa_beast5:STATUS),
isAnimalStatusPresent(@%pa_beast6:STATUS) ) )"
handler="active_menu"
params="menu=ui:interface:animal_menu_all" />
<!-- If SINGLE MENU, display the menu -->
@ -1305,6 +1308,21 @@
bars_entry="UI:VARIABLES:BARS:ANIMAL:3"
beast_db_entry="%pa_beast3"
bag_path="%pa_bag3" />
<instance template="pa_template"
index="5"
bars_entry="UI:VARIABLES:BARS:ANIMAL:4"
beast_db_entry="%pa_beast4"
bag_path="%pa_bag3" />
<instance template="pa_template"
index="6"
bars_entry="UI:VARIABLES:BARS:ANIMAL:5"
beast_db_entry="%pa_beast5"
bag_path="%pa_bag3" />
<instance template="pa_template"
index="7"
bars_entry="UI:VARIABLES:BARS:ANIMAL:6"
beast_db_entry="%pa_beast6"
bag_path="%pa_bag3" />
<!-- ***************************** -->
<!-- * ANIMAL(S) DEAD WINDOW * -->
<!-- ***************************** -->
@ -1456,11 +1474,32 @@
info_entry="%pa_beast3"
bag_entry="%pa_bag3"
icon_db="INV_PA3" />
<instance template="animal_inventory_template"
id="inv_pa4"
title="4"
info_entry="%pa_beast4"
bag_entry="%pa_bag4"
icon_db="INV_PA4" />
<instance template="animal_inventory_template"
id="inv_pa5"
title="5"
info_entry="%pa_beast5"
bag_entry="%pa_bag5"
icon_db="INV_PA5" />
<instance template="animal_inventory_template"
id="inv_pa6"
title="6"
info_entry="%pa_beast6"
bag_entry="%pa_bag6"
icon_db="INV_PA6" />
<tree node="animal_global">
<!-- MAX_INVENTORY_ANIMAL -->
<tree node="userpa1" />
<tree node="userpa2" />
<tree node="userpa3" />
<tree node="userpa4" />
<tree node="userpa5" />
<tree node="userpa6" />
<tree node="userpa7" />
</tree>
</interface_config>

Write Preview
Loading…
Cancel
Save