Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Added: New icon for new lock-loot system (in test on yubo)

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
Nuno Gonçalves 2017-06-23 20:13:38 +02:00
parent 627cec783c
commit c9c0cbe88f
2 changed files with 36 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
code/ryzom/client/data/gamedev/interfaces_v3/interaction.lua
View file

@ -217,7 +217,7 @@ end
-- Is its level known (not too high ...) -- Is its level known (not too high ...)
-- Boss/Mini-bosses/Names colored ring -- Boss/Mini-bosses/Names colored ring
function game:updateTargetConsiderUI() function game:updateTargetConsiderUI()
--debugInfo("Updating consider widget") -- debugInfo("Updating consider widget")
local targetWindow = getUI("ui:interface:target") local targetWindow = getUI("ui:interface:target")
-- --
@ -228,12 +228,14 @@ function game:updateTargetConsiderUI()
local wgToolTip = targetWindow:find("target_tooltip") local wgToolTip = targetWindow:find("target_tooltip")
local wgPvPTag = targetWindow:find("pvp_tags") local wgPvPTag = targetWindow:find("pvp_tags")
local wgHeader = targetWindow:find("header_opened") local wgHeader = targetWindow:find("header_opened")
local wgLock = targetWindow:find("lock")
wgTargetSlotForce.active = true wgTargetSlotForce.active = true
wgImpossible.active = true wgImpossible.active = true
-- no selection ? -- no selection ?
if twGetTargetLevel() == -1 then if twGetTargetLevel() == -1 then
wgLock.active = false
wgTargetSlotForce.active = false wgTargetSlotForce.active = false
wgTargetLevel.active = false wgTargetLevel.active = false
wgImpossible.active = false wgImpossible.active = false
@ -254,20 +256,36 @@ function game:updateTargetConsiderUI()
wgPvPTag.active = false wgPvPTag.active = false
wgHeader.h = 34; 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 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 if (twIsTargetPlayer()) then
-- don't display anything ... -- don't display anything ...
wgLock.active = false
wgTargetSlotForce.active = false wgTargetSlotForce.active = false
wgTargetLevel.active = false wgTargetLevel.active = false
wgImpossible.active = false wgImpossible.active = false
wgSlotRing.active = false wgSlotRing.active = false
wgToolTip.tooltip = "" wgToolTip.tooltip = ""
if twIsTargetInPVPMode() then if twIsTargetInPVPMode() then
debugInfo("target in pvp")
wgPvPTag.active = true wgPvPTag.active = true
wgHeader.h = 56; wgHeader.h = 56;
end end
return 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.active = "250 50 50 255"
end
end
end end
-- depending on the number of people in the group, set the max diff for visibility between player level -- depending on the number of people in the group, set the max diff for visibility between player level

13
code/ryzom/client/data/gamedev/interfaces_v3/interaction.xml
View file

@ -277,6 +277,19 @@
global_color="false" global_color="false"
render_layer="1" render_layer="1"
active="true" /> 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" <ctrl type="tooltip"
id="target_tooltip" id="target_tooltip"
tooltip="uittConsiderTargetNoSelection" tooltip="uittConsiderTargetNoSelection"