new script engine, and things maybe be bugged for a while

2025-10-17 21:13:26 +02:00 · 2011-07-26 20:13:27 -03:00
parent ab7394f357
commit 70f0b0dace
137 changed files with 2905 additions and 2578 deletions
--- a/data/modules/mainmenu/ui/entergamewindow.otml
+++ b/data/modules/mainmenu/ui/entergamewindow.otml
@@ -1,67 +1,54 @@
 %window#enterGameWindow
  title: Enter Game
-  size: [236, 178]
+  size: [236, 160]
  anchors.horizontalCenter: parent.horizontalCenter
  anchors.verticalCenter: parent.verticalCenter
-  onLoad: self:setLocked()

  %label#accountNameLabel
+    skin: large
    text: Account name
    anchors.left: parent.left
    anchors.top: parent.top
    margin.left: 18
-    margin.top: 33
+    margin.top: 28
+
+  %textEdit#accountNameTextEdit
+    text: tibialua0
+    anchors.left: parent.left
+    anchors.right: parent.right
+    anchors.top: prev.bottom
+    margin.left: 18
+    margin.right: 18

  %label#passwordLabel
-    text: "Password:"
-    anchors.left: parent.left
-    anchors.top: parent.top
-    margin.left: 18
-    margin.top: 62
+    skin: large
+    text: Password
+    anchors.left: prev.left
+    anchors.top: prev.bottom
+    margin.top: 8

-  %label#createAccountLabel
-    text: |
-      If you don't have
-      an account yet
+  %textEdit#passwordTextEdit
+    text: lua123456
    anchors.left: parent.left
-    anchors.top: parent.top
+    anchors.right: parent.right
+    anchors.top: prev.bottom
    margin.left: 18
-    margin.top: 87
-
-  %button#createAccountButton
-    text: Create Account
-    anchors.left: parent.left
-    anchors.top: parent.top
-    margin.top: 94
-    margin.left: 132
-    onClick: displayErrorBox("Error", "Not implemented yet")
+    margin.right: 18

  %button#okButton
    text: Ok
-    size: [43, 20]
-    anchors.right: parent.right
+    width: 64
+    anchors.right: next.left
    anchors.bottom: parent.bottom
-    margin.bottom: 10
-    margin.right: 66
+    margin.bottom: 16
+    margin.right: 16
    onClick: EnterGame_connectToLoginServer()

  %button#cancelButton
    text: Cancel
-    size: [43, 20]
+    width: 64
    anchors.right: parent.right
    anchors.bottom: parent.bottom
-    margin.bottom: 10
-    margin.right: 13
-    onClick: self.parent:destroy()
-
-  %textEdit#accountNameTextEdit
-    anchors.right: parent.right
-    anchors.top: parent.top
-    margin.top: 32
-    margin.right: 18
-
-  %textEdit#passwordTextEdit
-    anchors.right: parent.right
-    anchors.top: parent.top
-    margin.top: 61
-    margin.right: 18
+    margin.bottom: 16
+    margin.right: 16
+    onClick: function(self) rootUI:getChild("enterGameWindow"):destroy() end
--- a/data/modules/mainmenu/ui/infowindow.otml
+++ b/data/modules/mainmenu/ui/infowindow.otml
@@ -3,7 +3,7 @@
  size: [244, 221]
  anchors.horizontalCenter: parent.horizontalCenter
  anchors.verticalCenter: parent.verticalCenter
-  onLoad: self.locked = true
+  onLoad: function(self) self:setLocked() end

  %panel#infoPanel
    skin: flatPanel
@@ -39,7 +39,7 @@

    %button#websiteButton
      text: Github Page
-      size: [80,22]
+      size: [88, 24]
      anchors.right: parent.right
      anchors.bottom: parent.bottom
      margin.bottom: 9
@@ -55,9 +55,9 @@

  %button#okButton
    text: Ok
-    size: [43, 20]
+    size: [46, 24]
    anchors.left: parent.left
    anchors.top: parent.top
    margin.top: 191
    margin.left: 188
-    onClick: self.parent:destroy()
+    onClick: function(self) self.parent:destroy() end
--- a/data/modules/mainmenu/ui/mainmenu.otml
+++ b/data/modules/mainmenu/ui/mainmenu.otml
@@ -7,7 +7,7 @@

  %panel#mainMenu
    skin: roundedGridPanel
-    size: [117, 171]
+    size: [144, 162]
    anchors.left: parent.left
    anchors.bottom: parent.bottom
    margin.left: 60
@@ -17,33 +17,26 @@
      text: Enter Game
      anchors.top: parent.top
      anchors.horizontalCenter: parent.horizontalCenter
-      margin.top: 16
-      onClick: UI.load("entergamewindow")
-
-    %button#accessAccountButton
-      text: Access Account
-      anchors.top: parent.top
-      anchors.horizontalCenter: parent.horizontalCenter
-      margin.top: 46
-      onClick: displayErrorBox("Error", "Not implemented yet")
+      margin.top: 18
+      onClick: loadUI("entergamewindow", rootUI)

    %button#optionsButton
      text: Options
-      anchors.top: parent.top
+      anchors.top: prev.bottom
      anchors.horizontalCenter: parent.horizontalCenter
-      margin.top: 76
-      onClick: UI.load("optionswindow")
+      margin.top: 10
+      onClick: loadUI("optionswindow", rootUI)

    %button#infoButton
      text: Info
-      anchors.top: parent.top
+      anchors.top: prev.bottom
      anchors.horizontalCenter: parent.horizontalCenter
-      margin.top: 106
-      onClick: UI.load("infowindow")
+      margin.top: 10
+      onClick: loadUI("infowindow", rootUI)

    %button#exitGameButton
      text: Exit
-      anchors.top: parent.top
+      anchors.top: prev.bottom
      anchors.horizontalCenter: parent.horizontalCenter
-      margin.top: 136
+      margin.top: 10
      onClick: terminateApplication()
--- a/data/modules/mainmenu/ui/optionswindow.otml
+++ b/data/modules/mainmenu/ui/optionswindow.otml
@@ -3,7 +3,7 @@
  size: [286, 262]
  anchors.horizontalCenter: parent.horizontalCenter
  anchors.verticalCenter: parent.verticalCenter
-  onLoad: self.locked = true
+  onLoad: function(self) self:setLocked(true) end

  # general
  %button#generalButton
@@ -17,10 +17,10 @@
    text: |-
      Change general
      game options
-    anchors.left: parent.left
-    anchors.top: parent.top
-    margin.left: 117
-    margin.top: 29
+    anchors.left: prev.right
+    anchors.top: prev.top
+    margin.left: 10
+    margin.top: -2

  # graphics
  %button#graphicsButton
@@ -34,10 +34,10 @@
    text: |-
      Change graphics and
      performance settings
-    anchors.left: parent.left
-    anchors.top: parent.top
-    margin.left: 117
-    margin.top: 62
+    anchors.left: prev.right
+    anchors.top: prev.top
+    margin.left: 10
+    margin.top: -2

  # console
  %button#consoleButton
@@ -49,10 +49,10 @@

  %label#consoleLabel
    text: Customise the console
-    anchors.left: parent.left
-    anchors.top: parent.top
-    margin.left: 117
-    margin.top: 95
+    anchors.left: prev.right
+    anchors.top: prev.top
+    margin.left: 10
+    margin.top: -2

  # hotkeys
  %button#hotkeysButton
@@ -64,10 +64,10 @@

  %label#hotkeysLabel
    text: Edit your hotkey texts
-    anchors.left: parent.left
-    anchors.top: parent.top
-    margin.left: 117
-    margin.top: 128
+    anchors.left: prev.right
+    anchors.top: prev.top
+    margin.left: 10
+    margin.top: -2

  %lineDecoration#middleSeparator
    anchors.left: parent.left
@@ -89,10 +89,10 @@
    text: |
      Show the most recent
      Message of the Day
-    anchors.left: parent.left
-    anchors.bottom: parent.bottom
-    margin.left: 117
-    margin.bottom: 56
+    anchors.left: prev.right
+    anchors.top: prev.top
+    margin.left: 10
+    margin.top: -2

  %lineDecoration#bottomSeparator
    anchors.left: parent.left
@@ -110,4 +110,4 @@
    anchors.bottom: parent.bottom
    margin.right: 10
    margin.bottom: 13
-    onClick: self.parent:destroy()
+    onClick: function(self) self.parent:destroy() end