diff --git a/modules/core_styles/styles/labels.otui b/modules/core_styles/styles/labels.otui index 56737203..c0f7b468 100644 --- a/modules/core_styles/styles/labels.otui +++ b/modules/core_styles/styles/labels.otui @@ -7,6 +7,9 @@ Label < UILabel LargerLabel < Label +GameLabel < UILabel + font: verdana-11px-antialised + color: #aaaaaa FrameCounter < UIFrameCounter size: 68 16 diff --git a/modules/game_healthbar/healthbar.otui b/modules/game_healthbar/healthbar.otui index 79019d82..b1ce60d7 100644 --- a/modules/game_healthbar/healthbar.otui +++ b/modules/game_healthbar/healthbar.otui @@ -14,7 +14,7 @@ ManaBar < UIProgressBar anchors.left: parent.left anchors.right: parent.right -HealthLabel < Label +HealthLabel < GameLabel color: white text-align: center font: verdana-11px-rounded @@ -23,7 +23,7 @@ HealthLabel < Label anchors.top: parent.top margin-top: 2 -ManaLabel < Label +ManaLabel < GameLabel color: white text-align: center font: verdana-11px-rounded diff --git a/modules/game_inventory/inventory.otui b/modules/game_inventory/inventory.otui index 39b8e11f..64291125 100644 --- a/modules/game_inventory/inventory.otui +++ b/modules/game_inventory/inventory.otui @@ -80,7 +80,7 @@ UIWindow anchors.horizontalCenter: prev.horizontalCenter margin-top: 5 - Label + GameLabel id: soul anchors.top: slot9.bottom anchors.bottom: slot8.bottom @@ -94,7 +94,7 @@ UIWindow source: /core_styles/images/panel_flat.png border: 1 - Label + GameLabel id: capacity anchors.top: slot10.bottom anchors.bottom: slot8.bottom diff --git a/modules/game_outfit/outfit.lua b/modules/game_outfit/outfit.lua index 7bd3313c..011cd79b 100644 --- a/modules/game_outfit/outfit.lua +++ b/modules/game_outfit/outfit.lua @@ -118,15 +118,6 @@ local function update() end -- public functions -function Outfit.test() - local button = createWidget('Button', rootWidget) - button:setText('Set Outfit') - button:moveTo({x = 0, y = 100}) - button:setWidth('100') - button:setHeight('30') - button.onClick = function() Game.openOutfitWindow() end -end - function Outfit.create(creature, outfitList) Outfit.destroy() window = displayUI('outfit.otui', { parent = rootWidget }) @@ -207,8 +198,5 @@ function Outfit.previousType() end -- hooked events - connect(Game, { onOpenOutfitWindow = Outfit.create, onLogout = Outfit.destroy }) - -connect(Game, { onLogin = Outfit.test }) diff --git a/modules/game_skills/skills.otui b/modules/game_skills/skills.otui index a88f2a34..4d0dadc4 100644 --- a/modules/game_skills/skills.otui +++ b/modules/game_skills/skills.otui @@ -5,7 +5,7 @@ SkillButton < UIButton margin-top: 3 margin-left: 10 margin-right: 10 - + @onClick: | function(self) local percentBar = self:getChildById('percent') @@ -20,13 +20,13 @@ SkillButton < UIButton end end -SkillNameLabel < Label +SkillNameLabel < GameLabel font: verdana-11px-monochrome anchors.left: parent.left anchors.top: parent.top anchors.bottom: parent.bottom -SkillValueLabel < Label +SkillValueLabel < GameLabel id: value font: verdana-11px-monochrome text-align: topright @@ -49,8 +49,8 @@ SkillPercentPanel < UIProgressBar MiniWindow id: skillWindow title: Skills - size: 200 220 - + size: 200 400 + Panel id: skillPanel anchors.fill: parent @@ -59,14 +59,14 @@ MiniWindow margin-left: 3 margin-right: 3 layout: verticalBox - + SkillButton id: experience height: 15 SkillNameLabel text: Experience SkillValueLabel - + SkillButton id: level SkillNameLabel @@ -74,42 +74,42 @@ MiniWindow SkillValueLabel SkillPercentPanel background-color: red - + SkillButton id: health height: 15 SkillNameLabel text: Hit Points SkillValueLabel - + SkillButton id: mana height: 15 SkillNameLabel text: Mana SkillValueLabel - + SkillButton id: soul height: 15 SkillNameLabel text: Soul Points SkillValueLabel - + SkillButton id: capacity height: 15 SkillNameLabel text: Capacity SkillValueLabel - + SkillButton id: stamina SkillNameLabel text: Stamina SkillValueLabel SkillPercentPanel - + SkillButton id: magiclevel SkillNameLabel @@ -124,17 +124,17 @@ MiniWindow text: Fist Fighting SkillValueLabel SkillPercentPanel - + SkillButton id: skillId1 SkillNameLabel text: Club Fighting SkillValueLabel SkillPercentPanel - + SkillButton id: skillId2 - + SkillNameLabel text: Sword Fighting SkillValueLabel diff --git a/modules/game_textmessage/textmessage.otui b/modules/game_textmessage/textmessage.otui index 2b1717ba..aad8bee6 100644 --- a/modules/game_textmessage/textmessage.otui +++ b/modules/game_textmessage/textmessage.otui @@ -1,4 +1,4 @@ -CenterLabel < Label +CenterLabel < GameLabel font: verdana-11px-rounded height: 64 text-align: center @@ -6,7 +6,7 @@ CenterLabel < Label anchors.left: parent.left anchors.right: parent.right -BottomLabel < Label +BottomLabel < GameLabel font: verdana-11px-rounded height: 16 text-align: center diff --git a/modules/game_viplist/viplist.otui b/modules/game_viplist/viplist.otui index 68a8e7db..567d8dcf 100644 --- a/modules/game_viplist/viplist.otui +++ b/modules/game_viplist/viplist.otui @@ -1,8 +1,6 @@ -VipListLabel < Label +VipListLabel < GameLabel font: verdana-11px-monochrome margin-left: 5 - - $disabled: ~ MiniWindow id: vipWindow