From 9935c795c29af905398f20bfde5e883a6480593c Mon Sep 17 00:00:00 2001
From: DarkGod <darkgod@net-core.org>
Date: Thu, 27 Aug 2020 13:46:24 +0200
Subject: [PATCH] Fixed party display to not show the levelup icon for
uncontrollable members
---
game/engines/default/engine/Chat.lua | 2 ++
game/modules/tome/class/uiset/Minimalist.lua | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/game/engines/default/engine/Chat.lua b/game/engines/default/engine/Chat.lua
index 94d1410cf4..7058f46589 100644
--- a/game/engines/default/engine/Chat.lua
+++ b/game/engines/default/engine/Chat.lua
@@ -26,6 +26,7 @@ local slt2 = require "slt2"
module(..., package.seeall, class.make)
_M.chat_context_strings = {"#{italic}##LIGHT_GREEN#", "#LAST##{normal}#"}
+_M.chat_bold_strings = {"#{bold}#", "#{normal}#"}
--- Init
-- @string name used to load a chat file
@@ -91,6 +92,7 @@ function _M:addChat(c)
if not c.ignore_easy_controls and c.text then
c.text = c.text:gsub("<<<(.-)>>>", self.chat_context_strings[1].."%1"..self.chat_context_strings[2])
+ c.text = c.text:gsub("%*%*(.-)%*%*", self.chat_bold_strings[1].."%1"..self.chat_bold_strings[2])
end
-- Parse answers looking for quick replies
diff --git a/game/modules/tome/class/uiset/Minimalist.lua b/game/modules/tome/class/uiset/Minimalist.lua
index 459f1affad..1468670190 100644
--- a/game/modules/tome/class/uiset/Minimalist.lua
+++ b/game/modules/tome/class/uiset/Minimalist.lua
@@ -1458,7 +1458,7 @@ function _M:displayParty(scale, bx, by)
core.display.glScissor(false)
local p = (game.player == a) and portrait or portrait_unsel
- if a.unused_stats > 0 or a.unused_talents > 0 or a.unused_generics > 0 or a.unused_talents_types > 0 and def.control == "full" then
+ if (a.unused_stats > 0 or a.unused_talents > 0 or a.unused_generics > 0 or a.unused_talents_types > 0) and def.control == "full" then
p = (game.player == a) and portrait_lev or portrait_unsel_lev
end
p[1]:toScreenFull(x, y, p[6], p[7], p[2], p[3])
--
GitLab