feat: merge upstream

.gitignore

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

README.md

@@ -164,7 +164,7 @@ Beyond of it's flexibility with scripts, otclient comes with tons of other featu
       - ThingCategoryCreature 
       - ThingExternalTexture: are images in Png | Apng
 
-    - [Wiki](https://github.com/Nottinghster/otclient/wiki/Wiki-Attached-Effects)  
+    - [Wiki](https://github.com/mehah/otclient/wiki/Tutorial-Attached-Effects)  
 
     - Example Code:
     (code sample: [effects.lua](https://github.com/mehah/otclient/blob/main/modules/game_attachedeffects/effects.lua), [code test](https://github.com/mehah/otclient/blob/main/modules/game_attachedeffects/attachedeffects.lua#L1))
@@ -176,7 +176,7 @@ Beyond of it's flexibility with scripts, otclient comes with tons of other featu
 
 | <img src="https://github.com/kokekanon/OTredemption-Picture-NODELETE/blob/main/Picture/Attached%20Effect/Creature/001_Bone.gif?raw=true" width="200" alt="Haskanoid Video" style="max-width:200px;"> | <img src="https://github.com/kokekanon/OTredemption-Picture-NODELETE/blob/main/Picture/Attached%20Effect/Creature/002_aura.gif?raw=true" width="200" alt="Peoplemon by Alex Stuart" style="max-width: 200px;"> | <img src="https://github.com/kokekanon/OTredemption-Picture-NODELETE/blob/main/Picture/Attached%20Effect/Creature/003_particula.gif?raw=true" width="250" alt="Space Invaders" style="max-width: 250px;"> |
 |-------------------------------------------|---------------|-------------------------|
-| Creature Attached Effect | Light Attached Effect | Creature Particule |
+| ThingCategory Attached Effect | Texture(Png) Attached Effect | <center> Particule </center> |
 
 
 - Floor Shadowing
@@ -194,7 +194,7 @@ Beyond of it's flexibility with scripts, otclient comes with tons of other featu
 
 </details>
 
-- Client 12.85 ~ 12.92, 13.00 ~ 13.32 support (protobuf)
+- Client 12.85 ~ 12.92, 13.00 ~ 13.40 support (protobuf)
 - Market has been rewritten to work only [Canary](https://github.com/opentibiabr/canary)
 - Async Texture Loading
 - <details>
@@ -237,7 +237,7 @@ Beyond of it's flexibility with scripts, otclient comes with tons of other featu
 </details>
 
 - Drawpool 3
-- Tile Widget [Wiki](https://github.com/mehah/otclient/wiki)
+- Tile Widget [Wiki](https://github.com/mehah/otclient/wiki/Tutorial-Attached-Effects)
 
 | <img src="https://github.com/kokekanon/OTredemption-Picture-NODELETE/blob/main/Picture/Attached%20Effect/Tile/001_attachedeffect.gif?raw=true" width="250" alt="Haskanoid Video" style="max-width:250px;"> | <img src="https://github.com/kokekanon/OTredemption-Picture-NODELETE/blob/main/Picture/Attached%20Effect/Tile/002_widget.png?raw=true" width="200" alt="Peoplemon by Alex Stuart" style="max-width: 200px;"> | <img src="https://github.com/kokekanon/OTredemption-Picture-NODELETE/raw/main/Picture/Attached%20Effect/Tile/003_particulas.gif?raw=true" width="310" alt="Space Invaders" style="max-width: 310px;"> |
 |-------------------------------------------|---------------|-------------------------|
@@ -256,7 +256,13 @@ Beyond of it's flexibility with scripts, otclient comes with tons of other featu
    - [Blessing](https://github.com/mehah/otclient/pull/825)
 </details>
 
+- Support DirectX
 
+- <details>
+   <summary>Garbage Collection </summary>
+  <br>
+  Garbage collector is used to check what is no longer being used and remove it from memory. (lua, texture, drawpool, thingtype)
+</details>
 
 
 
@@ -421,33 +427,45 @@ Beyond of it's flexibility with scripts, otclient comes with tons of other featu
 
 | <img src="https://github.com/kokekanon/OTredemption-Picture-NODELETE/blob/main/Picture/Layout%2013/001_interface.png?raw=true" width="300" alt="Haskanoid Video" style="max-width:300px;"> | <img src="https://github.com/kokekanon/OTredemption-Picture-NODELETE/blob/main/Picture/Layout%2013/002_ingame.png?raw=true" width="300" alt="Peoplemon by Alex Stuart" style="max-width: 300px;"> |
 |-------------------------------------------|---------------|
-| Interface. | In-game |
-- blessing
+|<center> Interface </center> | <center>In-game</center> |
+- Imbuement tracker by [@Reyaleman](https://github.com/reyaleman)
+- Blessing
 - Screenshot
-- highscores
-- Store
-- Cyclopedia
+- Highscores
+- Store (compatible with 13.32 - 13.40)
+- QuickLoot
+- Groups Vip
+
+- <details>
+   <summary>Browser Client by @OTArchive</summary>
+
+  - by [@OTArchive](https://github.com/OTArchive)
+  - wiki: https://github.com/OTArchive/otclient-web/wiki/Guia-%E2%80%90-OTClient-Redemption-Web
+  - <video src="https://github.com/kokekanon/OTredemption-Picture-NODELETE/blob/main/Wiki/2024-09-27_19-50-58.mp4?raw=true" width="400" controls></video>
+
+</details>
 
 ##### 💸 Sponsored  (Features)
-- Bot V8 | ([@luanluciano93](https://github.com/luanluciano93), [@SkullzOTS](https://github.com/SkullzOTS), [@kokekanon](https://github.com/kokekanon), [@FranciskoKing](https://github.com/FranciskoKing), [@Kizuno18](https://github.com/Kizuno18))
+- Bot V8  ([@luanluciano93](https://github.com/luanluciano93), [@SkullzOTS](https://github.com/SkullzOTS), [@kokekanon](https://github.com/kokekanon), [@FranciskoKing](https://github.com/FranciskoKing), [@Kizuno18](https://github.com/Kizuno18))
   - Is adapted in 85%
   - To enable it, it is necessary to remove/off the BOT_PROTECTION flag.
   - [VS Solution](https://github.com/mehah/otclient/blob/68e4e1b94c2041bd235441244156e6477058250c/vc17/settings.props#L9) / [CMAKE](https://github.com/mehah/otclient/blob/68e4e1b94c2041bd235441244156e6477058250c/src/CMakeLists.txt#L13)
 
-- Shader with Framebuffer | ([@SkullzOTS](https://github.com/SkullzOTS), [@Mryukiimaru](https://github.com/Mryukiimaru), [@JeanTheOne](https://github.com/JeanTheOne), [@KizaruHere](https://github.com/KizaruHere))
+- Shader with Framebuffer  ([@SkullzOTS](https://github.com/SkullzOTS), [@Mryukiimaru](https://github.com/Mryukiimaru), [@JeanTheOne](https://github.com/JeanTheOne), [@KizaruHere](https://github.com/KizaruHere))
 
 | <img src="https://github.com/kokekanon/OTredemption-Picture-NODELETE/blob/main/Picture/Shader/Framebuffer/001_creature.gif?raw=true" width="200" alt="Haskanoid Video" style="max-width:200px;"> | <img src="https://github.com/kokekanon/OTredemption-Picture-NODELETE/blob/main/Picture/Shader/Framebuffer/002_items.gif?raw=true" width="200" alt="Peoplemon by Alex Stuart" style="max-width: 200px;"> | <img src="https://github.com/kokekanon/OTredemption-Picture-NODELETE/blob/main/Picture/Shader/Framebuffer/003_UICreature.gif?raw=true" width="110" alt="Space Invaders" style="max-width: 110px;"> |
 |-------------------------------------------|---------------|-------------------------|
-| Creature. | Items | UICreature |
-
+| <center>Creature.</center> |<center> Items</center> |<center> UICreature </center> |
 
+- Full Cyclopedia ([@luanluciano93](https://github.com/luanluciano93), [@kokekanon](https://github.com/kokekanon), [@MUN1Z](https://github.com/MUN1Z) ,[@qatari](https://github.com/qatari) )
 
 ##### [OTClient V8](https://github.com/OTCv8) (Features)
 - Lighting System
 - Floor Fading
 - Path Finding
-- game shop module
-- game outfit module
+- Module Shop
+- Module Oufit
+- Placeholder
 
 ## <a name="themobileproject"><img height="32" src="https://raw.githubusercontent.com/github/explore/80688e429a7d4ef2fca1e82350fe8e3517d3494d/topics/android/android.png" alt="Android"> The Mobile Project </a>
 The Mobile Project
@@ -505,39 +523,37 @@ Have found a bug? Please create an issue in our [bug tracker](https://github.com
 
 > \[!TIP]
 >
-> if using Nostalrius 7.2, Nekiro TFS-1.5-Downgrades-7.72 OR any protocol below 860 that the walking system is **stuttering**. set this to true.
-https://github.com/mehah/otclient/blob/main/data/setup.otml#L21
+> if using Nostalrius 7.2, Nekiro TFS-1.5-Downgrades-7.72 OR any protocol below 860 that the walking system is **stuttering**. set 
+[force-new-walking-formula: true](https://github.com/mehah/otclient/blob/cf7badda978de88cb3724615688e3d9da2ff4207/data/setup.otml#L21) in setup.otml
+>
+> In Old Protocol , if you consider that the speed of the item is too fast, modify [item-ticks-per-frame: 75](https://github.com/mehah/otclient/blob/cf7badda978de88cb3724615688e3d9da2ff4207/data/setup.otml#L32)  in setup.otml
 
 ## <a name="roadmap">❤️ Roadmap</a>
 
 | TO-DO list            	| Status                            	| PR   	|
 |-----------------------	|-----------------------------------	|------	|
 | Android compatibility 	| ![](https://geps.dev/progress/50) 	| [Branch](https://github.com/mehah/otclient/tree/mobile-working) 	|
 | Familiar outfit       	| ![](https://geps.dev/progress/30) 	| [#39](https://github.com/Nottinghster/otclient/pull/39) 	|
-| Cyclopedia            	| ![](https://geps.dev/progress/90) 	| [#47](https://github.com/Nottinghster/otclient/pull/47) 	|
-| Blessing            	| ![](https://geps.dev/progress/100) 	| [#825](https://github.com/mehah/otclient/pull/825)	|
-| wheel_of_destiny            	| ![](https://geps.dev/progress/1) 	| None	|
+| wheel of destiny            	| ![](https://geps.dev/progress/1) 	| None	|
+| Forge            	| ![](https://geps.dev/progress/1) 	| None	|
 | Analyzer              	| ![](https://geps.dev/progress/10)   |  [#802](https://github.com/mehah/otclient/pull/802)    	|
-| fix Extended view new-layout | ![](https://geps.dev/progress/0)   |   None   	|
-| Quickloot | ![](https://geps.dev/progress/30)   |   None   	|
+| fix: Extended view new-layout | ![](https://geps.dev/progress/0)   |   None   	|
 | Sound tibia 13 | ![](https://geps.dev/progress/0)   |   None   	|
 
 ## <a name="supportprotocol">💯 Support Protocol</a>
 
 
-
-
-
 | Protocol / version   	| Description                 	| Required Feature                                    	| Compatibility 	|
 |---------------------	|-----------------------------	|-----------------------------------------------------	|---------------	|
-| TFS <br> (7.72)      	| Downgrade nekiro /<br> Nostalrius 	|                                           	| ✅            	|
-| TFS 0.4 <br> (8.6)       	| Fir3element                	|                                  	| ✅             	|
-| TFS 1.5  <br> (8.0 / 8.60) 	| Downgrade nekiro / <br>MillhioreBT     	| [force-new-walking-formula: true](https://github.com/kokekanon/otclient.readme/blob/readme3/data/setup.otml#L21)                     	| ✅             	|
+| TFS <br> (7.72)      	| Downgrade nekiro /<br> Nostalrius 	|                  [force-new-walking-formula: true](https://github.com/mehah/otclient/blob/cf7badda978de88cb3724615688e3d9da2ff4207/data/setup.otml#L21)        <br>   [item-ticks-per-frame: 75](https://github.com/mehah/otclient/blob/cf7badda978de88cb3724615688e3d9da2ff4207/data/setup.otml#L32)                          	| ✅            	|
+| TFS 0.4 <br> (8.6)       	| Fir3element                	|  [item-ticks-per-frame: 75](https://github.com/mehah/otclient/blob/cf7badda978de88cb3724615688e3d9da2ff4207/data/setup.otml#L32)                                 	| ✅             	|
+| TFS 1.5  <br> (8.0 / 8.60) 	| Downgrade nekiro / <br>MillhioreBT     	| [force-new-walking-formula: true](https://github.com/mehah/otclient/blob/cf7badda978de88cb3724615688e3d9da2ff4207/data/setup.otml#L21)        <br>   [item-ticks-per-frame: 75](https://github.com/mehah/otclient/blob/cf7badda978de88cb3724615688e3d9da2ff4207/data/setup.otml#L32)        	| ✅             	|
 | TFS 1.4.2 <br> (10.98)   	| Release Otland              	|                                              	| ✅             	|
 | TFS 1.6  <br>(13.10)     	| Main repo <br> otland (2024)     	| [See wiki](https://github.com/mehah/otclient/wiki/Tutorial-to-Use-OTC-in-TFS-main) 	| ✅             	|
 | Canary 13.21        	| OpenTibiaBr               	| [Assets , Enable HTTP login and port 80](https://docs.opentibiabr.com/opentibiabr/projects/otclient-redemption#how-to-connect-on-canary-with-otclient-redemption)            	| ✅             	|
 | Canary 13.32        	| OpenTibiaBr              	| [Assets ,  Enable HTTP login and port 80](https://docs.opentibiabr.com/opentibiabr/projects/otclient-redemption#how-to-connect-on-canary-with-otclient-redemption)           	| ✅             	|
-| Canary 13.40        	| OpenTibiaBr              	|            	| 〰️             	|
+| Canary 13.40        	| OpenTibiaBr              	| [Assets ,  Enable HTTP login and port 80](https://docs.opentibiabr.com/opentibiabr/projects/otclient-redemption#how-to-connect-on-canary-with-otclient-redemption)           	| ✅             	|
+
 
 
 

data/setup.otml

@@ -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/styles/10-checkboxes.otui

@@ -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/styles/10-items.otui

@@ -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
 

mods/game_bot/default_configs/vBot_4.8/targetbot/looting.lua

@@ -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)

mods/game_bot/default_configs/vBot_4.8/targetbot/looting.otui

@@ -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

mods/game_bot/default_configs/vBot_4.8/vBot/analyzer.lua

@@ -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)

mods/game_bot/default_configs/vBot_4.8/vBot/extras.lua

@@ -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"