Version 2.2 - retro layout + bug fixes

This commit is contained in:
OTCv8
2020-03-31 21:34:09 +02:00
parent 1df9b82846
commit 6b39f061ae
189 changed files with 3384 additions and 4603 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 331 B

BIN
data/images/ui/discord.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 614 B

BIN
data/minimap.otmm Normal file

Binary file not shown.

View File

@@ -2,7 +2,7 @@ Button < UIButton
font: verdana-11px-antialised
color: #dfdfdfff
size: 106 23
text-offset: 0 0
text-offset: 0 1
image-source: /images/ui/button
image-color: #dfdfdf
image-clip: 0 0 22 23
@@ -27,6 +27,7 @@ TabButton < UIButton
image-color: #dfdfdf
image-clip: 0 0 22 23
image-border: 3
text-offset: 0 1
icon-color: #dfdfdf
color: #dfdfdf
@@ -47,6 +48,7 @@ NextButton < UIButton
image-source: /images/ui/arrow_horizontal
image-clip: 12 0 12 21
image-color: #ffffff
text-offset: 0 1
$hover !disabled:
image-clip: 12 21 12 21
@@ -62,6 +64,7 @@ PreviousButton < UIButton
image-source: /images/ui/arrow_horizontal
image-clip: 0 0 12 21
image-color: #ffffff
text-offset: 0 1
$hover !disabled:
image-clip: 0 21 12 21
@@ -76,6 +79,7 @@ AddButton < UIButton
size: 20 20
image-source: /images/ui/icon_add
image-color: #dfdfdfff
text-offset: 0 1
$hover !disabled:
image-color: #dfdfdf99

View File

@@ -19,10 +19,16 @@ LifeProgressBar < UIProgressBar
font: verdana-11px-rounded
text-offset: 0 2
margin: 2
ProgressRect < UIProgressRect
anchors.fill: parent
phantom: true
color: white
background-color: #00000088
font: verdana-11px-rounded
HealthBar < ProgressBar
background-color: #ff4444
ManaBar < ProgressBar
background-color: #4444ff

View File

@@ -92,6 +92,9 @@ TabBarVertical < UITabBar
anchors.right: scrollBar.left
anchors.bottom: parent.bottom
vertical-scrollbar: scrollBar
margin-right: 1
padding-top: 10
VerticalScrollBar
id: scrollBar
anchors.top: parent.top

View File

@@ -60,3 +60,56 @@ TopMenuFrameCounterLabel < Label
TopMenuPingLabel < Label
font: verdana-11px-rounded
TopMenu < TopMenuPanel
id: topMenu
anchors.top: parent.top
anchors.left: parent.left
anchors.right: parent.right
TopMenuButtonsPanel
id: leftButtonsPanel
anchors.top: parent.top
anchors.bottom: parent.bottom
anchors.left: parent.left
TopMenuButtonsPanel
id: leftGameButtonsPanel
anchors.top: parent.top
anchors.bottom: parent.bottom
anchors.left: prev.right
visible: false
TopMenuFrameCounterLabel
id: fpsLabel
text-auto-resize: true
anchors.top: parent.top
anchors.left: leftGameButtonsPanel.right
TopMenuPingLabel
color: white
id: pingLabel
text-auto-resize: true
anchors.top: fpsLabel.bottom
anchors.left: fpsLabel.left
Label
id: onlineLabel
anchors.top: parent.top
anchors.bottom: parent.bottom
anchors.horizontalCenter: parent.horizontalCenter
text-align: center
text-auto-resize: true
TopMenuButtonsPanel
id: rightButtonsPanel
anchors.top: parent.top
anchors.bottom: parent.bottom
anchors.right: parent.right
TopMenuButtonsPanel
id: rightGameButtonsPanel
anchors.top: parent.top
anchors.bottom: parent.bottom
anchors.right: prev.left
visible: false

View File

@@ -125,6 +125,4 @@ MiniWindowContents < ScrollablePanel
margin-right: 1
vertical-scrollbar: miniwindowScrollBar
BorderlessGameWindow < UIWindow
focusable: false
margin: 2
HeadlessMiniWindow < MiniWindow

View File

@@ -0,0 +1,5 @@
Background < Panel
image-source: /images/background
image-smooth: true
image-fixed-ratio: true
margin-top: 1

185
data/styles/40-console.otui Normal file
View File

@@ -0,0 +1,185 @@
ConsoleLabel < UITextEdit
font: verdana-11px-antialised
height: 14
color: yellow
margin-left: 2
text-wrap: true
text-auto-resize: true
selection-color: #111416
selection-background-color: #999999
change-cursor-image: false
cursor-visible: false
editable: false
draggable: true
selectable: false
focusable: false
ConsolePhantomLabel < UILabel
font: verdana-11px-antialised
height: 14
color: yellow
text-wrap: true
text-auto-resize: true
selection-color: #111416
selection-background-color: #999999
ConsoleTabBar < MoveableTabBar
height: 28
ConsoleTabBarPanel < MoveableTabBarPanel
id: consoleTab
ScrollablePanel
id: consoleBuffer
anchors.fill: parent
margin-right: 12
vertical-scrollbar: consoleScrollBar
layout:
type: verticalBox
align-bottom: true
border-width: 1
border-color: #202327
background: #00000066
inverted-scroll: true
padding: 1
VerticalScrollBar
id: consoleScrollBar
anchors.top: parent.top
anchors.bottom: parent.bottom
anchors.right: parent.right
step: 14
pixels-scroll: true
ConsoleTabBarButton < MoveableTabBarButton
height: 28
padding: 15
ConsolePanel < Panel
image-source: /images/ui/panel_bottom
image-border: 4
$first:
anchors.fill: parent
$!first:
anchors.top: prev.bottom
anchors.bottom: parent.bottom
anchors.left: parent.left
anchors.right: parent.right
CheckBox
id: toggleChat
!tooltip: tr('Disable chat mode, allow to walk using ASDW')
anchors.left: parent.left
anchors.top: parent.top
margin-left: 13
margin-top: 8
@onCheckChange: toggleChat()
TabButton
id: prevChannelButton
icon: /images/game/console/leftarrow
anchors.left: toggleChat.right
anchors.top: parent.top
margin-left: 3
margin-top: 6
ConsoleTabBar
id: consoleTabBar
anchors.left: prev.right
anchors.top: parent.top
anchors.right: next.left
margin-left: 5
margin-top: 3
margin-right: 5
tab-spacing: 2
movable: true
TabButton
id: nextChannelButton
icon: /images/game/console/rightarrow
anchors.right: next.left
anchors.top: parent.top
margin-right: 5
margin-top: 6
TabButton
id: closeChannelButton
!tooltip: tr('Close this channel') .. ' (Ctrl+E)'
icon: /images/game/console/closechannel
anchors.right: next.left
anchors.top: parent.top
enabled: false
margin-right: 5
margin-top: 6
@onClick: removeCurrentTab()
TabButton
id: clearChannelButton
!tooltip: tr('Clear current message window')
icon: /images/game/console/clearchannel
anchors.right: next.left
anchors.top: parent.top
margin-right: 5
margin-top: 6
@onClick: |
local consoleTabBar = self:getParent():getChildById('consoleTabBar')
clearChannel(consoleTabBar)
TabButton
id: channelsButton
!tooltip: tr('Open new channel') .. ' (Ctrl+O)'
icon: /images/game/console/channels
anchors.right: next.left
anchors.top: parent.top
margin-right: 5
margin-top: 6
@onClick: g_game.requestChannels()
TabButton
id: ignoreButton
!tooltip: tr('Ignore players')
icon: /images/game/console/ignore
anchors.right: parent.right
anchors.top: parent.top
margin-right: 5
margin-top: 6
@onClick: onClickIgnoreButton()
Panel
id: consoleContentPanel
anchors.top: prev.bottom
anchors.left: parent.left
anchors.right: parent.right
anchors.bottom: consoleTextEdit.top
margin-left: 6
margin-right: 6
margin-bottom: 4
margin-top: 4
padding: 1
focusable: false
phantom: true
TabButton
id: sayModeButton
icon: /images/game/console/say
!tooltip: tr('Adjust volume')
&sayMode: 2
size: 20 20
anchors.left: parent.left
anchors.bottom: parent.bottom
margin-left: 6
margin-bottom: 6
@onClick: sayModeChange()
TextEdit
id: consoleTextEdit
anchors.left: sayModeButton.right
anchors.right: parent.right
anchors.bottom: parent.bottom
margin-right: 6
margin-left: 6
margin-bottom: 6
shift-navigation: true
max-length: 255

View File

@@ -0,0 +1,73 @@
PageButton < Button
size: 30 18
margin: 1
ContainerWindow < MiniWindow
height: 150
UIItem
id: containerItemWidget
virtual: true
size: 16 16
anchors.top: parent.top
anchors.left: parent.left
margin-top: 1
margin-left: 3
UIButton
id: upButton
anchors.top: lockButton.top
anchors.right: lockButton.left
margin-right: 3
size: 14 14
image-source: /images/ui/miniwindow_buttons
image-clip: 42 0 14 14
$hover:
image-clip: 42 14 14 14
$pressed:
image-clip: 42 28 14 14
Panel
id: pagePanel
anchors.left: parent.left
anchors.right: parent.right
anchors.top: miniwindowTopBar.bottom
margin: 1 3 0 3
background: #00000066
height: 20
$on:
visible: true
$!on:
visible: false
Label
id: pageLabel
anchors.top: parent.top
anchors.horizontalCenter: parent.horizontalCenter
margin-top: 2
text-auto-resize: true
PageButton
id: prevPageButton
text: <
anchors.top: parent.top
anchors.left: parent.left
PageButton
id: nextPageButton
text: >
anchors.top: parent.top
anchors.right: parent.right
MiniWindowContents
padding-right: 0
layout:
type: grid
cell-size: 34 34
flow: true

View File

@@ -0,0 +1,3 @@
EnterGameWindow < StaticMainWindow
!text: tr('Enter Game')
size: 260 354

View File

@@ -0,0 +1,2 @@
GameButtonsWindow < MiniWindow
height: 40

View File

@@ -0,0 +1,146 @@
ExperienceBar < ProgressBar
id: experienceBar
background-color: #B6E866
anchors.top: prev.bottom
anchors.left: parent.left
anchors.right: parent.right
margin: 1
margin-top: 3
SoulLabel < GameLabel
id: soulLabel
text-align: right
color: white
font: verdana-11px-rounded
anchors.bottom: parent.bottom
anchors.right: parent.right
anchors.left: parent.horizontalCenter
margin-top: 5
margin-right: 3
on: true
$!on:
visible: false
margin-top: 0
height: 0
CapLabel < GameLabel
id: capLabel
color: white
font: verdana-11px-rounded
anchors.bottom: parent.bottom
anchors.left: parent.left
anchors.right: parent.horizontalCenter
margin-top: 5
margin-left: 3
on: true
$!on:
visible: false
margin-top: 0
height: 0
ConditionWidget < UIWidget
size: 18 18
$!first:
margin-left: 2
HealthOverlay < UIWidget
id: healthOverlay
anchors.fill: parent
phantom: true
HealthBar
id: topHealthBar
anchors.top: parent.top
anchors.left: parent.left
anchors.right: parent.horizontalCenter
phantom: true
ManaBar
id: topManaBar
anchors.top: parent.top
anchors.right: parent.right
anchors.left: parent.horizontalCenter
phantom: true
UIProgressBar
id: healthCircle
anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter
image-source: /images/game/circle/left_empty
margin-right: 169
margin-bottom: 16
opacity: 0.5
phantom: true
UIProgressBar
id: healthCircleFront
anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter
image-source: /images/game/circle/left_full
margin-right: 169
margin-bottom: 16
opacity: 0.5
phantom: true
UIProgressBar
id: manaCircle
anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter
image-source: /images/game/circle/right_empty
margin-left: 130
margin-bottom: 16
opacity: 0.5
phantom: true
UIProgressBar
id: manaCircleFront
anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter
image-source: /images/game/circle/right_full
margin-left: 130
margin-bottom: 16
opacity: 0.4
image-color: #0000FFFF
phantom: true
HealthInfoWindow < MiniWindow
icon: /images/topbuttons/healthinfo
!text: tr('Health Info')
height: 123
MiniWindowContents
HealthBar
id: healthBar
anchors.top: parent.top
anchors.left: parent.left
anchors.right: parent.right
margin: 2
margin-top: 1
ManaBar
id: manaBar
anchors.top: prev.bottom
anchors.left: parent.left
anchors.right: parent.right
margin: 2
ExperienceBar
Panel
id: conditionPanel
layout:
type: horizontalBox
height: 22
margin-top: 4
padding: 2
anchors.top: prev.bottom
anchors.left: parent.left
anchors.right: parent.right
border-width: 1
border-color: #00000077
background-color: #ffffff11
SoulLabel
CapLabel

View File

@@ -0,0 +1,299 @@
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 < UIButton
id: purseButton
size: 34 12
!tooltip: tr('Open purse')
icon-source: /images/game/slots/purse
icon-clip: 0 0 34 12
$on:
icon-clip: 0 12 34 12
$pressed:
icon-clip: 0 12 34 12
CombatBox < UICheckBox
size: 20 20
image-clip: 0 0 20 20
margin-left: 4
$checked:
image-clip: 0 20 20 20
InventoryButton < Button
font: verdana-11px-antialised
height: 18
margin-top: 2
text-align: center
SoulCapLabel < GameLabel
text-align: center
color: #FFFFFF
font: cipsoftFont
margin-top: 4
text-offset: 0 3
width: 36
height: 20
icon-source: /images/game/slots/soulcap
FightOffensiveBox < CombatBox
image-source: /images/game/combatmodes/fightoffensive
FightBalancedBox < CombatBox
image-source: /images/game/combatmodes/fightbalanced
FightDefensiveBox < CombatBox
image-source: /images/game/combatmodes/fightdefensive
ChaseModeBox < CombatBox
image-source: /images/game/combatmodes/chasemode
SafeFightBox < CombatBox
image-source: /images/game/combatmodes/safefight
MountButton < CombatBox
image-source: /images/game/combatmodes/mount
InventoryWindow < MiniWindow
icon: /images/topbuttons/inventory
height: 200
id: inventoryWindow
@onClose: modules.game_inventory.onMiniWindowClose()
&save: true
&autoOpen: 3
MiniWindowContents
anchors.left: parent.left
Panel
id: inventoryPanel
margin-right: 63
margin-top: 2
anchors.fill: parent
HeadSlot
anchors.top: parent.top
anchors.horizontalCenter: parent.horizontalCenter
margin-top: 3
BodySlot
anchors.top: prev.bottom
anchors.horizontalCenter: prev.horizontalCenter
margin-top: 3
LegSlot
anchors.top: prev.bottom
anchors.horizontalCenter: prev.horizontalCenter
margin-top: 3
FeetSlot
anchors.top: prev.bottom
anchors.horizontalCenter: prev.horizontalCenter
margin-top: 3
NeckSlot
anchors.top: slot1.top
anchors.right: slot1.left
margin-top: 13
margin-right: 5
LeftSlot
anchors.top: prev.bottom
anchors.horizontalCenter: prev.horizontalCenter
margin-top: 3
FingerSlot
anchors.top: prev.bottom
anchors.horizontalCenter: prev.horizontalCenter
margin-top: 3
BackSlot
anchors.top: slot1.top
anchors.left: slot1.right
margin-top: 13
margin-left: 5
RightSlot
anchors.top: prev.bottom
anchors.horizontalCenter: prev.horizontalCenter
margin-top: 3
AmmoSlot
anchors.top: prev.bottom
anchors.horizontalCenter: prev.horizontalCenter
margin-top: 3
SoulCapLabel
id: soulLabel
anchors.top: slot10.bottom
anchors.horizontalCenter: slot10.horizontalCenter
SoulCapLabel
id: capLabel
anchors.top: slot9.bottom
anchors.horizontalCenter: slot9.horizontalCenter
PurseButton
anchors.left: slot3.left
anchors.bottom: slot3.top
margin-bottom: 3
Panel
id: conditionPanel
layout:
type: horizontalBox
height: 22
padding: 2
anchors.top: slot8.bottom
anchors.left: slot6.left
anchors.right: slot5.right
margin-top: 4
border-width: 1
border-color: #00000077
background-color: #ffffff22
Panel
margin-top: 5
anchors.fill: parent
anchors.left: prev.right
FightOffensiveBox
id: fightOffensiveBox
anchors.left: parent.left
anchors.top: parent.top
margin-left: 8
ChaseModeBox
id: chaseModeBox
anchors.left: prev.right
anchors.top: parent.top
FightBalancedBox
id: fightBalancedBox
margin-top: 22
anchors.left: parent.left
anchors.top: parent.top
margin-left: 8
SafeFightBox
id: safeFightBox
margin-top: 22
anchors.left: prev.right
anchors.top: parent.top
FightDefensiveBox
id: fightDefensiveBox
margin-top: 44
anchors.left: parent.left
anchors.top: parent.top
margin-left: 8
MountButton
id: mountButton
margin-top: 44
anchors.left: prev.right
anchors.top: parent.top
Panel
id: buttonsPanel
margin-top: 4
margin-right: 5
anchors.fill: parent
anchors.top: prev.bottom
layout:
type: verticalBox
UIButton
id: buttonPvp
height: 20
icon: /images/game/combatmodes/pvp
icon-clip: 0 0 42 20
$on:
icon-clip: 0 20 42 20
InventoryButton
!text: tr('Stop')
@onClick: g_game.stop(); g_game.cancelAttackAndFollow()
InventoryButton
!text: tr('Options')
@onClick: modules.client_options.toggle()
InventoryButton
!text: tr('Hotkeys')
@onClick: modules.game_hotkeys.toggle()
InventoryButton
!text: tr('Logout')
@onClick: modules.game_interface.tryLogout()

View File

@@ -242,3 +242,27 @@ MinimapFlagWindow < MainWindow
width: 64
anchors.right: parent.right
anchors.bottom: parent.bottom
MinimapWindow < MiniWindow
height: 150
Label
text: ?
text-align: center
phantom: false
!tooltip: tr('Hold left mouse button to navigate\nScroll mouse middle button to zoom\nRight mouse button to create map marks\nPress Ctrl+Shift+M to view the entire game map')
anchors.top: lockButton.top
anchors.right: lockButton.left
margin-right: 3
size: 14 14
MiniWindowContents
Minimap
id: minimap
anchors.fill: parent
ResizeBorder
anchors.right: parent.right
anchors.top: parent.top
anchors.bottom: parent.bottom
enabled: true

View File

@@ -1,2 +0,0 @@
*
!.gitignore