fix: multiple errors produced in #621 (#712)

* fix: missing font [1] * fix: Error console [2] * fix: impossible to click checkbox [3] * fix: crash (patch solution) [4] * cleaning: remove incessant print [5] * Fix: isEnabledWASD was only updated on login * fix: Panels/widgets not saving positions #703 * fix: No websocket
mehah · Mar 2, 2024 · 64338a5 · 64338a5
1 parent d0d708c
commit 64338a5
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 11 deletions.
diff --git a/data/fonts/small-9px.otfont b/data/fonts/small-9px.otfont
@@ -0,0 +1,7 @@
+Font
+  name: small-9px
+  texture: small-9px
+  height: 9
+  glyph-size: 9 9
+  space-width: 3
+  spacing: 1 0
diff --git a/data/fonts/small-9px.png b/data/fonts/small-9px.png
diff --git a/mods/game_bot/default_configs/vBot_4.8/_Loader.lua b/mods/game_bot/default_configs/vBot_4.8/_Loader.lua
@@ -24,7 +24,7 @@ local luaFiles = {
   "extras",
   "cavebot",
   "playerlist",
-  "BotServer",
+  --"BotServer", --currently 02/03/24 No websocket
   "alarms",
   "Conditions",
   "Equipper",

diff --git a/mods/game_bot/default_configs/vBot_4.8/vBot/extras.lua b/mods/game_bot/default_configs/vBot_4.8/vBot/extras.lua
@@ -585,7 +585,7 @@ if true then
         guild = guild:sub(1, 10) -- change to proper (last) values
         guild = guild .. "..."
       end
-      local voc
+      local voc = "?"
       if text:lower():find("sorcerer") then
         voc = "MS"
       elseif text:lower():find("druid") then

diff --git a/mods/game_bot/default_configs/vBot_4.8/vBot/new_healer.otui b/mods/game_bot/default_configs/vBot_4.8/vBot/new_healer.otui
@@ -106,7 +106,7 @@ PriorityEntry < ToolTipLabel
     tooltip: Decrease Priority
 
 TargetSettings < Panel
-  size: 280 125
+  size: 280 135
   padding: 3
   image-source: /images/ui/window
   image-border: 6
@@ -131,7 +131,7 @@ TargetSettings < Panel
     anchors.verticalCenter: prev.verticalCenter
 
 Groups < FlatPanel
-  size: 150 90
+  size: 150 105
   padding: 3
   padding-top: 5
 
@@ -176,7 +176,7 @@ Groups < FlatPanel
       text: BotServer Members
 
 Vocations < FlatPanel
-  size: 100 90
+  size: 100 105
   padding: 3
   padding-top: 5
 

diff --git a/mods/game_bot/default_configs/vBot_4.8/vBot/playerlist.lua b/mods/game_bot/default_configs/vBot_4.8/vBot/playerlist.lua
@@ -43,6 +43,7 @@ local function clearCachedPlayers()
 end
 
 local refreshStatus = function()
+if g_game.getLocalPlayer():getHealthPercent() <= 0 then return end
     for _, spec in ipairs(getSpectators()) do
       if spec:isPlayer() and not spec:isLocalPlayer() then
         if config.outfits then
@@ -86,7 +87,7 @@ end
 refreshStatus()
 
 local checkStatus = function(creature)
-    if not creature:isPlayer() or creature:isLocalPlayer() then return end
+    if not creature:isPlayer() or creature:isLocalPlayer() or g_game.getLocalPlayer():getHealthPercent() <=  0 then return end
 
     local specName = creature:getName()
     local specOutfit = creature:getOutfit()

diff --git a/modules/corelib/ui/uiminiwindow.lua b/modules/corelib/ui/uiminiwindow.lua
@@ -14,8 +14,6 @@ function UIMiniWindow:open(dontSave)
     self:setSettings({ closed = false })
   end
 
-  self:raise()
-
   if self:getParent() then
     self:getParent():saveChildren()
   end

diff --git a/modules/corelib/ui/uiminiwindowcontainer.lua b/modules/corelib/ui/uiminiwindowcontainer.lua
@@ -93,7 +93,6 @@ function UIMiniWindowContainer:fitAll(noRemoveChild)
 
   -- close widgets
   for i = 1, #removeChildren do
-    print(removeChildren[i]:getId())
     if removeChildren[i].forceOpen then
       removeChildren[i]:minimize(true)
     else

diff --git a/modules/game_console/console.lua b/modules/game_console/console.lua
@@ -438,8 +438,7 @@ function load()
 end
 
 function isEnabledWASD()
-    local settings = g_settings.getNode('game_console')
-    return settings.wasdMode
+    return consoleToggleChat:isChecked()
 end
 
 function onTabChange(tabBar, tab)