feat: merge upstream (#3)

* perf: Drawpool 3.1

more stability in FPS

* setting m_effectAlpha, m_missileAlpha to 1.f

* fix: display density on mapview

* feat: hud scale

* fix: Interface Anchors (mehah#862)

* feat: support directx

* improve: use egl v3

* small change in gc

* fix: memory leak in controller

* improve: organization of the project structure

* add new config to draw covered things

There are projects where this system doesn't work very well, so if your project is one of those, just set it to true to fix the tiles that aren't being drawn.

* feat: update background image and startup sound to use 13.40 cip files. Adjustments in options buttons order and logout button icon. (mehah#865)

* update UIGraph (need test)

* fix shader warning

* fix: console error due to shaders

* draw-covered-things to false

Note: Setting false will not draw objects that the client understands are covered. If for some reason a tile is not being drawn because your game is custom, set this property to true and this issue will be resolved.

* baseline updated (update your vcpkg)

git pull

* Revert "baseline updated (update your vcpkg)"

This reverts commit 8dda995.

* fix: mehah#867

* feat: extractTexture in framebuffer, Arch SS2 by default and cleanup

* fix: inverted texture in extractTexture

* html: support tag img

* perf: reducing locking, thus increasing performance a little.

* fix draw shader

* prevent crash in static text

* improve: add lua call protection

* perf: improve propagateOnMouseMove

* fix: bot item ondrop and analyzer loot channel (mehah#887)

* fix: outfit size , prevent ERROR: invalid thing (mehah#884)

Co-authored-by: Rodrigo Paixão <god.rodrigo@hotmail.com>

* improve: HTTP login error handling to display login.php error messages (mehah#886)

* fix: compilation error on some pcs

* feat: full cyclopedia module (mehah#868)

* fix: game_store bugs. fix: mehah#873 (mehah#874)

* feat: Minimap GM teleport ( ctrl +shift + click on minimap) (mehah#885)

Co-authored-by: Luan Luciano <luanluciano@outlook.com>

* support "Mage" vocation (mehah#882)

several OT servers merge MS/ED vocation into a Mage vocation having the best features of both MS and ED.

Without this fix, on those servers, vBot would constantly error out with Error: (...) concatenat voc: a nil value

* fix (mehah#900)

* improve parseOpenContainer and fix error with decoration kit (mehah#890)

* fix: optional display rarity colors in items . feature GameColorizedLootValue 12.00 (mehah#896)

* fix: crash getItems (mehah#892)

* looting blacklist (mehah#881)

When "loot every item" is off, it will loot everything in the loot list.

When "loot every item" is on, it will loot everything that is not in the loot list, effectively making the loot list a blacklist when "loot every item" is on.

* Fix black and red squares behaviors (mehah#902)


* Fix squares:
- Set black squares color to 1 instead of 0 so it's not treated as alpha
- Fix creaturesMark logic so red squares don't disappear when attacking and black squares show when attacked

* feat: display tier UI (GameThingUpgradeClassification) (mehah#895)

* feat: Vips Groups | fix issue: mehah#730 (mehah#908)

* fix: spacing for align bottom vertical layouts (mehah#909)

* Fix: mehah#901

---------

Co-authored-by: Renato Machado <mehahx@gmail.com>
Co-authored-by: SkullzOTS <86809689+SkullzOTS@users.noreply.github.com>
Co-authored-by: Luan Luciano <luanluciano@outlook.com>
Co-authored-by: Felipe Muniz <felipe.silva@virtus.ufcg.edu.br>
Co-authored-by: Rodrigo Paixão <god.rodrigo@hotmail.com>
Co-authored-by: kokekanon <114332266+kokekanon@users.noreply.github.com>
Co-authored-by: divinity76 <divinity76@gmail.com>
Co-authored-by: divinity76 <hans@loltek.net>
Co-authored-by: OT Archive <112215823+OTArchive@users.noreply.github.com>
Co-authored-by: Marcin Jałocha <nekiro.dev@gmail.com>

Author: 10 people

.gitignore

@@ -24,6 +24,7 @@ static/
 [Oo]bj/
 cmake-build-*/
 vcpkg_installed/
+vc17/
 
 # MSTest test Results
 [Tt]est[Rr]esult*/

README.md

@@ -28,6 +28,7 @@ game
     diagonal-walk-speed: 3
 
   render
+    draw-covered-things: false
     invisible-ticks-per-frame: 75
     item-ticks-per-frame: 75
     effect-ticks-per-frame: 75

data/images/background.png

@@ -104,3 +104,33 @@ QtCheckBox < UICheckBox
 
   $checked disabled:
     image-clip: 0 26 14 14
+
+fakeCheckBox < UICheckBox
+  font: cipsoftFont
+  size: 106 23
+  image-source: /images/ui/button
+  image-clip: 0 0 22 23
+  image-border: 3
+  padding: 5 10 5 10
+  opacity: 1.0
+  color: #b9b9b9ff
+
+  $hover !disabled:
+    color: #ffffff
+
+  $!checked:
+    image-clip: 0 0 22 23
+
+  $hover !checked:
+    image-clip: 0 0 22 23
+
+  $checked:
+    image-clip: 0 46 22 23
+
+  $hover checked:
+    image-clip: 0 46 22 23
+
+  $disabled:
+    image-color: #dfdfdf88
+    color: #dfdfdf88
+    opacity: 0.8

data/images/game/cyclopedia/bestiary_off.png

@@ -8,7 +8,19 @@ Item < UIItem
 
   $disabled:
     color: #646464
-
+  UIWidget
+    id: tier
+    size: 10 9
+    image-source: /images/inventory/tiers-strip
+    image-clip: 0 0 10 9
+    image-size: 10 9
+    anchors.top: parent.top
+    anchors.right: parent.right
+    phantom: true
+    focusable: false
+    visible: false
+    image-smooth: true
+    
 MainInventoryItem < UIWidget
   image-source: /images/inventory/containerslot
   image-border: 3
@@ -180,5 +192,19 @@ MainInventoryItem < UIWidget
 
     Label
       id: Duration
-      anchors.fill: parent
+      anchors.bottom: parent.bottom
+      anchors.left: parent.left
+      phantom: true
+    UIWidget
+      id: tier
+      size: 10 9
+      image-source: /images/inventory/tiers-strip
+      image-clip: 0 0 10 9
+      image-size: 10 9
+      anchors.top: parent.top
+      anchors.right: parent.right
+      phantom: true
+      focusable: false
+      visible: false
+      image-smooth: true
 

data/images/game/cyclopedia/bestiary_on.png

@@ -14,6 +14,11 @@ TargetBot.Looting.setup = function()
   UI.Container(TargetBot.Looting.onContainersUpdate, true, nil, ui.containers)
   ui.everyItem.onClick = function()
     ui.everyItem:setOn(not ui.everyItem:isOn())
+    if ui.everyItem:isOn() then
+      ui.labelToLoot:setText("Items to ignore")
+    else
+      ui.labelToLoot:setText("Items to loot")
+    end
     TargetBot.save()
   end
   ui.maxDangerPanel.value.onTextChange = function()
@@ -224,7 +229,7 @@ TargetBot.Looting.lootContainer = function(lootContainers, container)
   for i, item in ipairs(container:getItems()) do
     if item:isContainer() and not itemsById[item:getId()] then
       nextContainer = item
-    elseif itemsById[item:getId()] or (ui.everyItem:isOn() and not item:isContainer()) then
+    elseif (not ui.everyItem:isOn() and itemsById[item:getId()]) or (ui.everyItem:isOn() and (not item:isContainer() and not itemsById[item:getId()])) then
       item.lootTries = (item.lootTries or 0) + 1
       if item.lootTries < 5 then -- if can't be looted within 0.5s then skip it
         return TargetBot.Looting.lootItem(lootContainers, item)

data/images/game/cyclopedia/bossSlot_off.png

@@ -18,8 +18,9 @@ TargetBotLootingPanel < Panel
 
   BotSwitch
     id: everyItem
-    !text: tr("Loot every item")
+    !text: tr("Loot every item, except these")
     margin-top: 2
+    font: small-9px
 
   Label
     margin-top: 5

data/images/game/cyclopedia/bossSlot_on.png

@@ -723,11 +723,10 @@ local expPerHour = function(calculation)
 end
 
 local function add(t, text, color, last)
-    table.insert(t, text)
-    table.insert(t, color)
+    local coloredText = "{" .. text .. ", " .. color .. "}"
+    table.insert(t, coloredText)
     if not last then
-        table.insert(t, ", ")
-        table.insert(t, "#FFFFFF")
+        table.insert(t, "{, , #FFFFFF}")
     end
 end
 
@@ -958,7 +957,8 @@ onTextMessage(function(mode, text)
     local panel = console.consoleTabBar:getTabPanel(tab)
     local consoleBuffer = panel:getChildById('consoleBuffer')
     local message = consoleBuffer:getLastChild()
-    message:setColoredText(t)
+    message:setColoredText(table.concat(t))
+
 end)
 
 local function niceFormat(v)

data/images/game/cyclopedia/bosstiary_off.png

@@ -588,7 +588,7 @@ if true then
         guild = guild .. "..."
       end
       local voc = "?"
-      if text:lower():find("sorcerer") then
+      if text:lower():find("sorcerer") or text:lower():find("mage") then
         voc = "MS"
       elseif text:lower():find("druid") then
         voc = "ED"