opentibiabr · Nottinghster · Oct 1, 2024 · Sep 8, 2024 · Sep 9, 2024 · Sep 9, 2024
diff --git a/README.md b/README.md
@@ -514,12 +514,10 @@ https://github.com/mehah/otclient/blob/main/data/setup.otml#L21
 |-----------------------	|-----------------------------------	|------	|
 | 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	|
+| 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   	|
 | Sound tibia 13 | ![](https://geps.dev/progress/0)   |   None   	|
 
 ## <a name="supportprotocol">💯 Support Protocol</a>
@@ -537,7 +535,7 @@ https://github.com/mehah/otclient/blob/main/data/setup.otml#L21
 | 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              	|            	| ✅             	|
 
 
 

diff --git a/data/images/game/cyclopedia/bestiary_off.png b/data/images/game/cyclopedia/bestiary_off.png
diff --git a/data/images/game/cyclopedia/bestiary_on.png b/data/images/game/cyclopedia/bestiary_on.png
diff --git a/data/images/game/cyclopedia/bossSlot_off.png b/data/images/game/cyclopedia/bossSlot_off.png
diff --git a/data/images/game/cyclopedia/bossSlot_on.png b/data/images/game/cyclopedia/bossSlot_on.png
diff --git a/data/images/game/cyclopedia/bosstiary_off.png b/data/images/game/cyclopedia/bosstiary_off.png
diff --git a/data/images/game/cyclopedia/bosstiary_on.png b/data/images/game/cyclopedia/bosstiary_on.png
diff --git a/data/images/game/cyclopedia/character_off.png b/data/images/game/cyclopedia/character_off.png
diff --git a/data/images/game/cyclopedia/character_on.png b/data/images/game/cyclopedia/character_on.png
diff --git a/data/images/game/cyclopedia/charms_off.png b/data/images/game/cyclopedia/charms_off.png
diff --git a/data/images/game/cyclopedia/charms_on.png b/data/images/game/cyclopedia/charms_on.png
diff --git a/data/images/game/cyclopedia/houses_off.png b/data/images/game/cyclopedia/houses_off.png
diff --git a/data/images/game/cyclopedia/houses_on.png b/data/images/game/cyclopedia/houses_on.png
diff --git a/data/images/game/cyclopedia/items_off.png b/data/images/game/cyclopedia/items_off.png
diff --git a/data/images/game/cyclopedia/items_on.png b/data/images/game/cyclopedia/items_on.png
diff --git a/data/images/game/cyclopedia/map_off.png b/data/images/game/cyclopedia/map_off.png
diff --git a/data/images/game/cyclopedia/map_on.png b/data/images/game/cyclopedia/map_on.png
diff --git a/data/images/game/cyclopedia/off.psd b/data/images/game/cyclopedia/off.psd
diff --git a/data/images/game/cyclopedia/on.psd b/data/images/game/cyclopedia/on.psd
diff --git a/data/images/game/slots/inventory-back.png b/data/images/game/slots/inventory-back.png
diff --git a/data/images/game/slots/inventory-feet.png b/data/images/game/slots/inventory-feet.png
diff --git a/data/images/game/slots/inventory-finger.png b/data/images/game/slots/inventory-finger.png
diff --git a/data/images/game/slots/inventory-head.png b/data/images/game/slots/inventory-head.png
diff --git a/data/images/game/slots/inventory-hip.png b/data/images/game/slots/inventory-hip.png
diff --git a/data/images/game/slots/inventory-left-hand.png b/data/images/game/slots/inventory-left-hand.png
diff --git a/data/images/game/slots/inventory-legs.png b/data/images/game/slots/inventory-legs.png
diff --git a/data/images/game/slots/inventory-neck.png b/data/images/game/slots/inventory-neck.png
diff --git a/data/images/game/slots/inventory-right-hand.png b/data/images/game/slots/inventory-right-hand.png
diff --git a/data/images/game/slots/inventory-torso.png b/data/images/game/slots/inventory-torso.png
diff --git a/data/images/options/ButtonBossSlot.png b/data/images/options/ButtonBossSlot.png
diff --git a/data/images/options/ButtonBosstiary.png b/data/images/options/ButtonBosstiary.png
diff --git a/data/images/options/bestiaryTracker.png b/data/images/options/bestiaryTracker.png
diff --git a/data/images/options/bosstiaryTracker.png b/data/images/options/bosstiaryTracker.png
diff --git a/data/images/topbuttons/bestiaryTracker.png b/data/images/topbuttons/bestiaryTracker.png
diff --git a/data/images/ui/backdrop-dark-grey.png b/data/images/ui/backdrop-dark-grey.png
diff --git a/data/images/ui/button-9grid-idle.png b/data/images/ui/button-9grid-idle.png
diff --git a/data/images/ui/button-9grid-pressed.png b/data/images/ui/button-9grid-pressed.png
diff --git a/data/images/ui/button-clear-18x18-down.png b/data/images/ui/button-clear-18x18-down.png
diff --git a/data/images/ui/button-clear-18x18-up.png b/data/images/ui/button-clear-18x18-up.png
diff --git a/data/images/ui/button-storexp-pressed.png b/data/images/ui/button-storexp-pressed.png
diff --git a/data/images/ui/button-storexp.png b/data/images/ui/button-storexp.png
diff --git a/data/images/ui/character/ammo.png b/data/images/ui/character/ammo.png
diff --git a/data/images/ui/character/ammo2.png b/data/images/ui/character/ammo2.png
diff --git a/data/images/ui/character/amulet.png b/data/images/ui/character/amulet.png
diff --git a/data/images/ui/character/amulet2.png b/data/images/ui/character/amulet2.png
diff --git a/data/images/ui/character/armor.png b/data/images/ui/character/armor.png
diff --git a/data/images/ui/character/armor2.png b/data/images/ui/character/armor2.png
diff --git a/data/images/ui/character/artifact.png b/data/images/ui/character/artifact.png
diff --git a/data/images/ui/character/artifact2.png b/data/images/ui/character/artifact2.png
diff --git a/data/images/ui/character/backpack.png b/data/images/ui/character/backpack.png
diff --git a/data/images/ui/character/backpack2.png b/data/images/ui/character/backpack2.png
diff --git a/data/images/ui/character/blank.png b/data/images/ui/character/blank.png
diff --git a/data/images/ui/character/boots.png b/data/images/ui/character/boots.png
diff --git a/data/images/ui/character/boots2.png b/data/images/ui/character/boots2.png
diff --git a/data/images/ui/character/helmet.png b/data/images/ui/character/helmet.png
diff --git a/data/images/ui/character/helmet2.png b/data/images/ui/character/helmet2.png
diff --git a/data/images/ui/character/icon.png b/data/images/ui/character/icon.png
diff --git a/data/images/ui/character/legs.png b/data/images/ui/character/legs.png
diff --git a/data/images/ui/character/legs2.png b/data/images/ui/character/legs2.png
diff --git a/data/images/ui/character/mainhand.png b/data/images/ui/character/mainhand.png
diff --git a/data/images/ui/character/mainhand2.png b/data/images/ui/character/mainhand2.png
diff --git a/data/images/ui/character/offhand.png b/data/images/ui/character/offhand.png
diff --git a/data/images/ui/character/offhand2.png b/data/images/ui/character/offhand2.png
diff --git a/data/images/ui/character/primary_backpack.png b/data/images/ui/character/primary_backpack.png
diff --git a/data/images/ui/character/ring.png b/data/images/ui/character/ring.png
diff --git a/data/images/ui/character/ring2.png b/data/images/ui/character/ring2.png
diff --git a/data/images/ui/character/rune.png b/data/images/ui/character/rune.png
diff --git a/data/images/ui/character/rune2.png b/data/images/ui/character/rune2.png
diff --git a/data/images/ui/character/secondary_backpack.png b/data/images/ui/character/secondary_backpack.png
diff --git a/data/images/ui/character/slot.png b/data/images/ui/character/slot.png
diff --git a/data/images/ui/ditherpattern.png b/data/images/ui/ditherpattern.png
diff --git a/data/images/ui/miniwindow_buttons.png b/data/images/ui/miniwindow_buttons.png
diff --git a/data/images/ui/progress-separator.png b/data/images/ui/progress-separator.png
diff --git a/data/images/ui/rarity_blue.png b/data/images/ui/rarity_blue.png
diff --git a/data/images/ui/rarity_green.png b/data/images/ui/rarity_green.png
diff --git a/data/images/ui/rarity_grey.png b/data/images/ui/rarity_grey.png
diff --git a/data/images/ui/rarity_purple.png b/data/images/ui/rarity_purple.png
diff --git a/data/images/ui/rarity_white.png b/data/images/ui/rarity_white.png
diff --git a/data/images/ui/rarity_yellow.png b/data/images/ui/rarity_yellow.png
diff --git a/data/images/ui/undefined_item.png b/data/images/ui/undefined_item.png
diff --git a/data/images/ui/widget-borderimage.png b/data/images/ui/widget-borderimage.png
diff --git a/data/styles/10-checkboxes.otui b/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
diff --git a/modules/corelib/ui/uimessagebox.lua b/modules/corelib/ui/uimessagebox.lua
@@ -11,11 +11,10 @@ function UIMessageBox.create(title, okCallback, cancelCallback)
     return calendar
 end
 
-
 function UIMessageBox.display(title, message, buttons, onEnterCallback, onEscapeCallback)
     local staticSizes = {
         width = {
-            max = 616,
+            max = 916,
             min = 116
         },
         height = {

diff --git a/modules/game_containers/containers.lua b/modules/game_containers/containers.lua
@@ -137,6 +137,7 @@ function onContainerOpen(container, previousContainer)
         local itemWidget = g_ui.createWidget('Item', containerPanel)
         itemWidget:setId('item' .. slot)
         itemWidget:setItem(container:getItem(slot))
+        ItemsDatabase.setRarityItem(itemWidget, container:getItem(slot))
         itemWidget:setMargin(0)
         itemWidget.position = container:getSlotPosition(slot)
 

diff --git a/modules/game_cooldown/cooldown.lua b/modules/game_cooldown/cooldown.lua
@@ -4,7 +4,7 @@ local ProgressCallback = {
 }
 
 cooldownWindow = nil
-cooldownButton = nil
+
 contentsPanel = nil
 cooldownPanel = nil
 lastPlayer = nil
@@ -20,23 +20,13 @@ function init()
         onSpellCooldown = onSpellCooldown
     })
 
-    cooldownButton = modules.game_mainpanel.addToggleButton('cooldownButton', tr('Cooldowns'),
-        '/images/options/cooldowns', toggle, false, 5)
-
     if modules.client_options.getOption('showSpellGroupCooldowns') then
-        cooldownButton:setOn(true)
         modules.client_options.setOption('showSpellGroupCooldowns', true)
     else
-        cooldownButton:setOn(false)
         modules.client_options.setOption('showSpellGroupCooldowns', false)
     end
 
-    cooldownButton:hide()
-
     cooldownWindow = g_ui.loadUI('cooldown', modules.game_interface.getBottomPanel())
-
-
-
     contentsPanel = cooldownWindow:getChildById('contentsPanel2')
     cooldownPanel = contentsPanel:getChildById('cooldownPanel')
 
@@ -59,7 +49,6 @@ function terminate()
     })
 
     cooldownWindow:destroy()
-    cooldownButton:destroy()
 
 end
 
@@ -98,39 +87,21 @@ function loadIcon(iconId)
 end
 
 function onMiniWindowOpen()
-    cooldownButton:setOn(true)
     modules.client_options.setOption('showSpellGroupCooldowns', true)
 end
 
 function onMiniWindowClose()
-    cooldownButton:setOn(false)
     modules.client_options.setOption('showSpellGroupCooldowns', false)
 end
 
-function toggle()
-    local console = modules.game_console.consolePanel
-    if cooldownButton:isOn() then
-        modules.client_options.setOption('showSpellGroupCooldowns', false)
-        cooldownButton:setOn(false)
-    else
-        modules.client_options.setOption('showSpellGroupCooldowns', true)
-        cooldownButton:setOn(true)
-    end
-end
-
 function online()
     local console = modules.game_console.consolePanel
     if console then
         console:addAnchor(AnchorTop, cooldownWindow:getId(), AnchorBottom)
     end
-    if g_game.getFeature(GameSpellList) then
-        cooldownButton:show()
-        cooldownButton:setOn(true)
-        modules.client_options.setOption('showSpellGroupCooldowns', true)
-    else
-        cooldownButton:hide()
-        cooldownButton:setOn(false)
+    if not g_game.getFeature(GameSpellList) then
         modules.client_options.setOption('showSpellGroupCooldowns', false)
+        return
     end
 
     if not lastPlayer or lastPlayer ~= g_game.getCharacterName() then
@@ -277,18 +248,11 @@ function onSpellGroupCooldown(groupId, duration)
 end
 
 function setSpellGroupCooldownsVisible(visible)
-    if not g_game.getFeature(GameSpellList) then
-        cooldownWindow:hide()
-        cooldownWindow:setHeight(10)
-        return
-    end
     if visible then
         cooldownWindow:setHeight(30)
         cooldownWindow:show()
     else
         cooldownWindow:hide()
         cooldownWindow:setHeight(10)
     end
-
-    cooldownButton:setOn(visible)
 end
diff --git a/modules/game_cyclopedia/cyclopedia_pages.otui b/modules/game_cyclopedia/cyclopedia_pages.otui
@@ -0,0 +1 @@
+CyclopediaPages < UIWidget