Updated advernturer blessing inventory style to be more robust
After Width: | Height: | Size: 4.0 KiB |
After Width: | Height: | Size: 4.9 KiB |
After Width: | Height: | Size: 4.9 KiB |
After Width: | Height: | Size: 4.6 KiB |
After Width: | Height: | Size: 4.1 KiB |
After Width: | Height: | Size: 4.4 KiB |
After Width: | Height: | Size: 4.5 KiB |
After Width: | Height: | Size: 4.6 KiB |
After Width: | Height: | Size: 4.3 KiB |
After Width: | Height: | Size: 5.0 KiB |
After Width: | Height: | Size: 3.1 KiB |
|
@ -62,13 +62,7 @@ function toggleAdventurerStyle(hasBlessing)
|
||||||
for slot = InventorySlotFirst, InventorySlotLast do
|
for slot = InventorySlotFirst, InventorySlotLast do
|
||||||
local itemWidget = inventoryPanel:getChildById('slot' .. slot)
|
local itemWidget = inventoryPanel:getChildById('slot' .. slot)
|
||||||
if itemWidget then
|
if itemWidget then
|
||||||
if hasBlessing then
|
itemWidget:setOn(hasBlessing)
|
||||||
itemWidget:setBorderWidth(1)
|
|
||||||
itemWidget:setBorderColor('#F7C80C')
|
|
||||||
else
|
|
||||||
itemWidget:setBorderWidth(0)
|
|
||||||
itemWidget:setBorderColor('white')
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -114,7 +108,7 @@ function onInventoryChange(player, slot, item, oldItem)
|
||||||
|
|
||||||
local itemWidget = inventoryPanel:getChildById('slot' .. slot)
|
local itemWidget = inventoryPanel:getChildById('slot' .. slot)
|
||||||
if item then
|
if item then
|
||||||
itemWidget:setStyle('Item')
|
itemWidget:setStyle('InventoryItem')
|
||||||
itemWidget:setItem(item)
|
itemWidget:setItem(item)
|
||||||
else
|
else
|
||||||
itemWidget:setStyle(InventorySlotStyles[slot])
|
itemWidget:setStyle(InventorySlotStyles[slot])
|
||||||
|
|
|
@ -1,54 +1,76 @@
|
||||||
InventoryItem < Item
|
InventoryItem < Item
|
||||||
|
$on:
|
||||||
|
image-source: /images/ui/item-blessed
|
||||||
|
|
||||||
HeadSlot < InventoryItem
|
HeadSlot < InventoryItem
|
||||||
id: slot1
|
id: slot1
|
||||||
image-source: /images/game/slots/head
|
image-source: /images/game/slots/head
|
||||||
&position: {x=65535, y=1, z=0}
|
&position: {x=65535, y=1, z=0}
|
||||||
|
$on:
|
||||||
|
image-source: /images/game/slots/head-blessed
|
||||||
|
|
||||||
BodySlot < InventoryItem
|
BodySlot < InventoryItem
|
||||||
id: slot4
|
id: slot4
|
||||||
image-source: /images/game/slots/body
|
image-source: /images/game/slots/body
|
||||||
&position: {x=65535, y=4, z=0}
|
&position: {x=65535, y=4, z=0}
|
||||||
|
$on:
|
||||||
|
image-source: /images/game/slots/body-blessed
|
||||||
|
|
||||||
LegSlot < InventoryItem
|
LegSlot < InventoryItem
|
||||||
id: slot7
|
id: slot7
|
||||||
image-source: /images/game/slots/legs
|
image-source: /images/game/slots/legs
|
||||||
&position: {x=65535, y=7, z=0}
|
&position: {x=65535, y=7, z=0}
|
||||||
|
$on:
|
||||||
|
image-source: /images/game/slots/legs-blessed
|
||||||
|
|
||||||
FeetSlot < InventoryItem
|
FeetSlot < InventoryItem
|
||||||
id: slot8
|
id: slot8
|
||||||
image-source: /images/game/slots/feet
|
image-source: /images/game/slots/feet
|
||||||
&position: {x=65535, y=8, z=0}
|
&position: {x=65535, y=8, z=0}
|
||||||
|
$on:
|
||||||
|
image-source: /images/game/slots/feet-blessed
|
||||||
|
|
||||||
NeckSlot < InventoryItem
|
NeckSlot < InventoryItem
|
||||||
id: slot2
|
id: slot2
|
||||||
image-source: /images/game/slots/neck
|
image-source: /images/game/slots/neck
|
||||||
&position: {x=65535, y=2, z=0}
|
&position: {x=65535, y=2, z=0}
|
||||||
|
$on:
|
||||||
|
image-source: /images/game/slots/neck-blessed
|
||||||
|
|
||||||
LeftSlot < InventoryItem
|
LeftSlot < InventoryItem
|
||||||
id: slot6
|
id: slot6
|
||||||
image-source: /images/game/slots/left-hand
|
image-source: /images/game/slots/left-hand
|
||||||
&position: {x=65535, y=6, z=0}
|
&position: {x=65535, y=6, z=0}
|
||||||
|
$on:
|
||||||
|
image-source: /images/game/slots/left-hand-blessed
|
||||||
|
|
||||||
FingerSlot < InventoryItem
|
FingerSlot < InventoryItem
|
||||||
id: slot9
|
id: slot9
|
||||||
image-source: /images/game/slots/finger
|
image-source: /images/game/slots/finger
|
||||||
&position: {x=65535, y=9, z=0}
|
&position: {x=65535, y=9, z=0}
|
||||||
|
$on:
|
||||||
|
image-source: /images/game/slots/finger-blessed
|
||||||
|
|
||||||
BackSlot < InventoryItem
|
BackSlot < InventoryItem
|
||||||
id: slot3
|
id: slot3
|
||||||
image-source: /images/game/slots/back
|
image-source: /images/game/slots/back
|
||||||
&position: {x=65535, y=3, z=0}
|
&position: {x=65535, y=3, z=0}
|
||||||
|
$on:
|
||||||
|
image-source: /images/game/slots/back-blessed
|
||||||
|
|
||||||
RightSlot < InventoryItem
|
RightSlot < InventoryItem
|
||||||
id: slot5
|
id: slot5
|
||||||
image-source: /images/game/slots/right-hand
|
image-source: /images/game/slots/right-hand
|
||||||
&position: {x=65535, y=5, z=0}
|
&position: {x=65535, y=5, z=0}
|
||||||
|
$on:
|
||||||
|
image-source: /images/game/slots/right-hand-blessed
|
||||||
|
|
||||||
AmmoSlot < InventoryItem
|
AmmoSlot < InventoryItem
|
||||||
id: slot10
|
id: slot10
|
||||||
image-source: /images/game/slots/ammo
|
image-source: /images/game/slots/ammo
|
||||||
&position: {x=65535, y=10, z=0}
|
&position: {x=65535, y=10, z=0}
|
||||||
|
$on:
|
||||||
|
image-source: /images/game/slots/ammo-blessed
|
||||||
|
|
||||||
PurseButton < Button
|
PurseButton < Button
|
||||||
id: purseButton
|
id: purseButton
|
||||||
|
|
|
@ -705,6 +705,7 @@ void Creature::setBaseSpeed(double baseSpeed)
|
||||||
callLuaField("onBaseSpeedChange", baseSpeed, oldBaseSpeed);
|
callLuaField("onBaseSpeedChange", baseSpeed, oldBaseSpeed);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Creature::setSkull(uint8 skull)
|
void Creature::setSkull(uint8 skull)
|
||||||
{
|
{
|
||||||
m_skull = skull;
|
m_skull = skull;
|
||||||
|
|