diff --git a/data/images/game/slots/ammo-blessed.png b/data/images/game/slots/ammo-blessed.png new file mode 100644 index 00000000..bed31d7b Binary files /dev/null and b/data/images/game/slots/ammo-blessed.png differ diff --git a/data/images/game/slots/back-blessed.png b/data/images/game/slots/back-blessed.png new file mode 100644 index 00000000..b369e6ea Binary files /dev/null and b/data/images/game/slots/back-blessed.png differ diff --git a/data/images/game/slots/body-blessed.png b/data/images/game/slots/body-blessed.png new file mode 100644 index 00000000..caa01ba9 Binary files /dev/null and b/data/images/game/slots/body-blessed.png differ diff --git a/data/images/game/slots/feet-blessed.png b/data/images/game/slots/feet-blessed.png new file mode 100644 index 00000000..29c011ff Binary files /dev/null and b/data/images/game/slots/feet-blessed.png differ diff --git a/data/images/game/slots/finger-blessed.png b/data/images/game/slots/finger-blessed.png new file mode 100644 index 00000000..575f34d8 Binary files /dev/null and b/data/images/game/slots/finger-blessed.png differ diff --git a/data/images/game/slots/head-blessed.png b/data/images/game/slots/head-blessed.png new file mode 100644 index 00000000..418f4f65 Binary files /dev/null and b/data/images/game/slots/head-blessed.png differ diff --git a/data/images/game/slots/left-hand-blessed.png b/data/images/game/slots/left-hand-blessed.png new file mode 100644 index 00000000..6140de88 Binary files /dev/null and b/data/images/game/slots/left-hand-blessed.png differ diff --git a/data/images/game/slots/legs-blessed.png b/data/images/game/slots/legs-blessed.png new file mode 100644 index 00000000..759f13b4 Binary files /dev/null and b/data/images/game/slots/legs-blessed.png differ diff --git a/data/images/game/slots/neck-blessed.png b/data/images/game/slots/neck-blessed.png new file mode 100644 index 00000000..e3b68757 Binary files /dev/null and b/data/images/game/slots/neck-blessed.png differ diff --git a/data/images/game/slots/right-hand-blessed.png b/data/images/game/slots/right-hand-blessed.png new file mode 100644 index 00000000..4a6bd9b3 Binary files /dev/null and b/data/images/game/slots/right-hand-blessed.png differ diff --git a/data/images/ui/item-blessed.png b/data/images/ui/item-blessed.png new file mode 100644 index 00000000..41db9d91 Binary files /dev/null and b/data/images/ui/item-blessed.png differ diff --git a/modules/game_inventory/inventory.lua b/modules/game_inventory/inventory.lua index 1dcc7c05..e97e9301 100644 --- a/modules/game_inventory/inventory.lua +++ b/modules/game_inventory/inventory.lua @@ -62,13 +62,7 @@ function toggleAdventurerStyle(hasBlessing) for slot = InventorySlotFirst, InventorySlotLast do local itemWidget = inventoryPanel:getChildById('slot' .. slot) if itemWidget then - if hasBlessing then - itemWidget:setBorderWidth(1) - itemWidget:setBorderColor('#F7C80C') - else - itemWidget:setBorderWidth(0) - itemWidget:setBorderColor('white') - end + itemWidget:setOn(hasBlessing) end end end @@ -114,7 +108,7 @@ function onInventoryChange(player, slot, item, oldItem) local itemWidget = inventoryPanel:getChildById('slot' .. slot) if item then - itemWidget:setStyle('Item') + itemWidget:setStyle('InventoryItem') itemWidget:setItem(item) else itemWidget:setStyle(InventorySlotStyles[slot]) diff --git a/modules/game_inventory/inventory.otui b/modules/game_inventory/inventory.otui index 4089118e..55335d45 100644 --- a/modules/game_inventory/inventory.otui +++ b/modules/game_inventory/inventory.otui @@ -1,54 +1,76 @@ InventoryItem < Item + $on: + image-source: /images/ui/item-blessed HeadSlot < InventoryItem id: slot1 image-source: /images/game/slots/head &position: {x=65535, y=1, z=0} + $on: + image-source: /images/game/slots/head-blessed BodySlot < InventoryItem id: slot4 image-source: /images/game/slots/body &position: {x=65535, y=4, z=0} + $on: + image-source: /images/game/slots/body-blessed LegSlot < InventoryItem id: slot7 image-source: /images/game/slots/legs &position: {x=65535, y=7, z=0} + $on: + image-source: /images/game/slots/legs-blessed FeetSlot < InventoryItem id: slot8 image-source: /images/game/slots/feet &position: {x=65535, y=8, z=0} + $on: + image-source: /images/game/slots/feet-blessed NeckSlot < InventoryItem id: slot2 image-source: /images/game/slots/neck &position: {x=65535, y=2, z=0} + $on: + image-source: /images/game/slots/neck-blessed LeftSlot < InventoryItem id: slot6 image-source: /images/game/slots/left-hand &position: {x=65535, y=6, z=0} + $on: + image-source: /images/game/slots/left-hand-blessed FingerSlot < InventoryItem id: slot9 image-source: /images/game/slots/finger &position: {x=65535, y=9, z=0} + $on: + image-source: /images/game/slots/finger-blessed BackSlot < InventoryItem id: slot3 image-source: /images/game/slots/back &position: {x=65535, y=3, z=0} + $on: + image-source: /images/game/slots/back-blessed RightSlot < InventoryItem id: slot5 image-source: /images/game/slots/right-hand &position: {x=65535, y=5, z=0} + $on: + image-source: /images/game/slots/right-hand-blessed AmmoSlot < InventoryItem id: slot10 image-source: /images/game/slots/ammo &position: {x=65535, y=10, z=0} + $on: + image-source: /images/game/slots/ammo-blessed PurseButton < Button id: purseButton diff --git a/src/client/creature.cpp b/src/client/creature.cpp index 1e646bc6..9aa1c2df 100644 --- a/src/client/creature.cpp +++ b/src/client/creature.cpp @@ -705,6 +705,7 @@ void Creature::setBaseSpeed(double baseSpeed) callLuaField("onBaseSpeedChange", baseSpeed, oldBaseSpeed); } } + void Creature::setSkull(uint8 skull) { m_skull = skull;