Resolve "Merge the best from 7.40 branch"

2025-10-14 14:44:55 +02:00 · 2022-04-06 14:58:52 +00:00
parent 3bd1a6f07e
commit 155da3573c
928 changed files with 43723 additions and 1221 deletions
--- a/SabrehavenOTClient/modules/client_options/interface.otui
+++ b/SabrehavenOTClient/modules/client_options/interface.otui
@@ -0,0 +1,172 @@
+OptionPanel
+  OptionCheckBox
+    id: classicView
+    !text: tr('Classic view')
+    margin-top: 5
+    
+    $mobile:
+      visible: false
+
+  OptionCheckBox
+    id: cacheMap
+    !text: tr('Cache map (for non-classic view)')
+
+    $mobile:
+      visible: false
+
+  OptionCheckBox
+    id: actionBar1
+    !text: tr("Show first action bar")
+
+  OptionCheckBox
+    id: actionBar2
+    !text: tr("Show second action bar")
+    
+  OptionCheckBox
+    id: showPing
+    !text: tr('Show connection ping')
+    !tooltip: tr('Display connection speed to the server (milliseconds)')
+
+  OptionCheckBox
+    id: displayNames
+    !text: tr('Display creature names')
+
+  OptionCheckBox
+    id: displayHealth
+    !text: tr('Display creature health bars')
+
+  OptionCheckBox
+    id: displayHealthOnTop
+    !text: tr('Display creature health bars above texts')
+    $mobile:
+      visible: false
+
+  OptionCheckBox
+    id: hidePlayerBars
+    !text: tr('Show player health bar')
+
+  OptionCheckBox
+    id: displayMana
+    !text: tr('Show player mana bar')
+    $mobile:
+      visible: false
+
+  OptionCheckBox
+    id: topHealtManaBar
+    !text: tr('Show player top health and mana bar')
+
+  OptionCheckBox
+    id: showHealthManaCircle
+    !text: tr('Show health and mana circle')
+    $mobile:
+      visible: false
+
+  OptionCheckBox
+    id: highlightThingsUnderCursor
+    !text: tr('Highlight things under cursor')
+
+  Panel
+    height: 40
+    margin-top: 3
+    
+    Label
+      width: 90
+      anchors.left: parent.left
+      anchors.top: parent.top
+      id: leftPanelsLabel
+      !text: tr("Left panels")
+
+    Label
+      width: 90
+      anchors.left: prev.right
+      anchors.top: prev.top
+      id: rightPanelsLabel
+      !text: tr("Right panels")
+
+    Label
+      width: 130
+      anchors.left: prev.right
+      anchors.top: prev.top
+      id: backpackPanelLabel
+      !text: tr("Container's panel")
+      !tooltip: tr("Open new containers in selected panel")
+
+    ComboBox
+      id: leftPanels
+      anchors.left: leftPanelsLabel.left
+      anchors.right: leftPanelsLabel.right
+      anchors.top: leftPanelsLabel.bottom
+      margin-top: 3
+      margin-right: 20
+      @onOptionChange: modules.client_options.setOption(self:getId(), self.currentIndex)
+      @onSetup: |
+        self:addOption("0")
+        self:addOption("1")
+        self:addOption("2")
+        self:addOption("3")
+        self:addOption("4")
+
+    ComboBox
+      id: rightPanels
+      anchors.left: rightPanelsLabel.left
+      anchors.right: rightPanelsLabel.right
+      anchors.top: rightPanelsLabel.bottom
+      margin-top: 3
+      margin-right: 20
+      @onOptionChange: modules.client_options.setOption(self:getId(), self.currentIndex)
+      @onSetup: |
+        self:addOption("1")
+        self:addOption("2")
+        self:addOption("3")
+        self:addOption("4")
+
+    ComboBox
+      id: containerPanel
+      anchors.left: backpackPanelLabel.left
+      anchors.right: backpackPanelLabel.right
+      anchors.top: backpackPanelLabel.bottom
+      margin-top: 3
+      @onOptionChange: modules.client_options.setOption(self:getId(), self.currentIndex)
+      @onSetup: |
+        self:addOption("1st left panel")
+        self:addOption("2nd left panel")
+        self:addOption("3rd left panel")
+        self:addOption("4th left panel")
+        self:addOption("1st right panel")
+        self:addOption("2nd right panel")
+        self:addOption("3rd right panel")
+        self:addOption("4th right panel")
+
+  Label
+    margin-top: 3
+    id: crosshairLabel
+    !text: tr("Crosshair")
+    
+  ComboBox
+    id: crosshair
+    margin-top: 3
+    margin-right: 2
+    margin-left: 2
+    @onOptionChange: modules.client_options.setOption(self:getId(), self.currentIndex)
+    @onSetup: |
+      self:addOption("None")
+      self:addOption("Default")
+      self:addOption("Full")
+
+  Label
+    id: floorFadingLabel
+    margin-top: 6
+    @onSetup: |
+      local value = modules.client_options.getOption('floorFading')
+      self:setText(tr('Floor fading: %s ms', value))
+
+  OptionScrollbar
+    id: floorFading
+    margin-top: 3
+    minimum: 0
+    maximum: 2000
+
+  Label
+    id: floorFadingLabel2
+    margin-top: 6
+    !text: (tr('Floor fading doesn\'t work with enabled light'))