diff --git a/game/engines/default/engine/Entity.lua b/game/engines/default/engine/Entity.lua index 9e8430d28fe570280cd8872cb114e5d5ecc6895c..2b318a01e8a984b59d90bd47fcb5a6ab75643ece 100644 --- a/game/engines/default/engine/Entity.lua +++ b/game/engines/default/engine/Entity.lua @@ -784,5 +784,7 @@ function _M:loadList(file, no_default, res, mod, loaded) setfenv(f, setmetatable(newenv, {__index=_G})) f() + self:triggerHook{"Entity:loadList", file=file, no_default=no_default, res=res, mod=mod, loaded=loaded} + return res end diff --git a/game/modules/tome/class/uiset/Minimalist.lua b/game/modules/tome/class/uiset/Minimalist.lua index 8eb9e56cc6184cda7221639b002985ba3415058d..6e288a49fa21904238b2c9b7cbf4eadbcacf95d3 100644 --- a/game/modules/tome/class/uiset/Minimalist.lua +++ b/game/modules/tome/class/uiset/Minimalist.lua @@ -956,7 +956,7 @@ function _M:handleEffect(player, eff_id, e, p, x, y, hs, bx, by, is_first, scale end self.tbuff[eff_id..":"..dur] = {eff_id, "tbuff"..eff_id, function(x, y) - core.display.drawQuad(x, y, hs, hs, 0, 0, 0, 255) + core.display.drawQuad(x+4, y+4, 32, 32, 0, 0, 0, 255) e.display_entity:toScreen(self.hotkeys_display_icons.tiles, x+4, y+4, 32, 32) UI:drawFrame(self.buffs_base, x, y, icon[1], icon[2], icon[3], 1) if txt then @@ -1007,7 +1007,7 @@ function _M:displayBuffs(scale, bx, by) game.tooltip_x, game.tooltip_y = 1, 1; game:tooltipDisplayAtMap(game.w, game.h, desc) end self.pbuff[tid] = {tid, "pbuff"..tid, function(x, y) - core.display.drawQuad(x, y, hs, hs, 0, 0, 0, 255) + core.display.drawQuad(x+4, y+4, 32, 32, 0, 0, 0, 255) t.display_entity:toScreen(self.hotkeys_display_icons.tiles, x+4, y+4, 32, 32) UI:drawFrame(self.buffs_base, x, y, frames_colors.sustain[1], frames_colors.sustain[2], frames_colors.sustain[3], 1) end, desc_fct}